Use named exports consistently internally (#904)

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## main
 
 ### ✨ Features and improvements
+- Use named imports internally - no package entrypoints changed ([#904](https://github.com/maplibre/maplibre-style-spec/pull/904))
 - _...Add new stuff here..._
 
 ### 🐞 Bug fixes

bin/gl-style-format.ts

@@ -2,7 +2,7 @@
 
 import fs from 'fs';
 import minimist from 'minimist';
-import format from '../src/format';
+import {format} from '../src/format';
 const argv = minimist(process.argv.slice(2));
 
 if (argv.help || argv.h || (!argv._.length && process.stdin.isTTY)) {

bin/gl-style-migrate.ts

@@ -2,8 +2,8 @@
 
 import fs from 'fs';
 import minimist from 'minimist';
-import format from '../src/format';
-import migrate from '../src/migrate';
+import {format} from '../src/format';
+import {migrate} from '../src/migrate';
 const argv = minimist(process.argv.slice(2));
 
 if (argv.help || argv.h || (!argv._.length && process.stdin.isTTY)) {

bin/gl-style-validate.ts

@@ -2,7 +2,7 @@
 
 import minimist from 'minimist';
 import rw from 'rw';
-import validate from '../src/validate_style';
+import {validateStyle as validate} from '../src/validate_style';
 
 const argv = minimist(process.argv.slice(2), {
     boolean: 'json',

build/bump-version-changelog.js

@@ -7,10 +7,10 @@
  * And adds on top a ## main with add stuff here.
  */
 
-import * as fs from 'fs';
+import {readFileSync, writeFileSync} from 'fs';
 
 const changelogPath = 'CHANGELOG.md';
-let changelog = fs.readFileSync(changelogPath, 'utf8');
+let changelog = readFileSync(changelogPath, 'utf8');
 changelog = changelog.replace('## main', `## ${process.argv[2]}`);
 changelog = changelog.replaceAll('- _...Add new stuff here..._\n', '');
 changelog = `## main
@@ -23,4 +23,4 @@ changelog = `## main
 
 ` + changelog;
 
-fs.writeFileSync(changelogPath, changelog, 'utf8');
+writeFileSync(changelogPath, changelog, 'utf8');

build/generate-style-spec.ts

@@ -1,7 +1,6 @@
-import * as fs from 'fs';
-import * as properties from '../src/util/properties';
-
+import {writeFileSync} from 'fs';
 import spec from '../src/reference/v8.json' with {type: 'json'};
+import {supportsPropertyExpression, supportsZoomExpression} from '../src/util/properties';
 
 function unionType(values) {
     if (Array.isArray(values)) {
@@ -45,9 +44,9 @@ function propertyType(property) {
         }
     })();
 
-    if (properties.supportsPropertyExpression(property)) {
+    if (supportsPropertyExpression(property)) {
         return `DataDrivenPropertyValueSpecification<${baseType}>`;
-    } else if (properties.supportsZoomExpression(property)) {
+    } else if (supportsZoomExpression(property)) {
         return `PropertyValueSpecification<${baseType}>`;
     } else if (property.expression) {
         return 'ExpressionSpecification';
@@ -116,7 +115,7 @@ function layerType(key) {
 
 const layerTypes = Object.keys(spec.layer.type.values);
 
-fs.writeFileSync('src/types.g.ts',
+writeFileSync('src/types.g.ts',
     `// Generated code; do not edit. Edit build/generate-style-spec.ts instead.
 /* eslint-disable */
 

build/release-notes.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-import * as fs from 'fs';
+import {readFileSync} from 'fs';
 import semver from 'semver';
 
 const changelogPath = 'CHANGELOG.md';
-const changelog = fs.readFileSync(changelogPath, 'utf8');
+const changelog = readFileSync(changelogPath, 'utf8');
 
 /*
   Parse the raw changelog text and split it into individual releases.

src/declass.test.ts

@@ -1,4 +1,4 @@
-import declass from './declass';
+import {declassStyle} from './declass';
 
 describe('declass', () => {
     test('declass a style, one class', () => {
@@ -16,7 +16,7 @@ describe('declass', () => {
             }]
         };
 
-        const declassed = declass(style, ['one']);
+        const declassed = declassStyle(style, ['one']);
 
         expect(declassed).not.toBe(style);
         expect(declassed.layers).not.toBe(style.layers);
@@ -47,7 +47,7 @@ describe('declass', () => {
             }]
         };
 
-        expect(declass(style, ['one'])).toEqual({
+        expect(declassStyle(style, ['one'])).toEqual({
             layers: [{
                 id: 'a',
                 paint: {
@@ -78,7 +78,7 @@ describe('declass', () => {
             }]
         };
 
-        expect(declass(style, ['one', 'two'])).toEqual({
+        expect(declassStyle(style, ['one', 'two'])).toEqual({
             layers: [{
                 id: 'a',
                 paint: {
@@ -104,7 +104,7 @@ describe('declass', () => {
             }]
         };
 
-        expect(declass(style, ['one'])).toEqual({
+        expect(declassStyle(style, ['one'])).toEqual({
             layers: [{
                 id: 'a',
                 paint: {

src/declass.ts

@@ -1,7 +1,5 @@
 
-import extend from './util/extend';
-
-export default declassStyle;
+import {extendBy} from './util/extend';
 
 /**
  * Returns a new style with the given 'paint classes' merged into each layer's
@@ -18,8 +16,8 @@ export default declassStyle;
  * // nightStyle now has each layer's `paint.night` properties merged in to the
  * // main `paint` property.
  */
-function declassStyle(style, classes) {
-    return extend({}, style, {
+export function declassStyle(style, classes) {
+    return extendBy({}, style, {
         layers: style.layers.map((layer) => {
             const result = classes.reduce(declassLayer, layer);
 
@@ -36,7 +34,7 @@ function declassStyle(style, classes) {
 }
 
 function declassLayer(layer, klass) {
-    return extend({}, layer, {
-        paint: extend({}, layer.paint, layer[`paint.${klass}`])
+    return extendBy({}, layer, {
+        paint: extendBy({}, layer.paint, layer[`paint.${klass}`])
     });
 }

src/deref.test.ts

@@ -1,8 +1,8 @@
-import deref from './deref';
+import {derefLayers} from './deref';
 
 describe('deref', () => {
     test('derefs a ref layer which follows its parent', () => {
-        expect(deref([
+        expect(derefLayers([
             {
                 'id': 'parent',
                 'type': 'line'
@@ -24,7 +24,7 @@ describe('deref', () => {
     });
 
     test('derefs a ref layer which precedes its parent', () => {
-        expect(deref([
+        expect(derefLayers([
             {
                 'id': 'child',
                 'ref': 'parent'

src/deref.ts

@@ -1,5 +1,5 @@
 
-import refProperties from './util/ref_properties';
+import {refProperties} from './util/ref_properties';
 
 function deref(layer, parent) {
     const result = {};
@@ -19,8 +19,6 @@ function deref(layer, parent) {
     return result;
 }
 
-export default derefLayers;
-
 /**
  * Given an array of layers, some of which may contain `ref` properties
  * whose value is the `id` of another property, return a new array where
@@ -34,7 +32,7 @@ export default derefLayers;
  * @param {Array<Layer>} layers
  * @returns {Array<Layer>}
  */
-function derefLayers(layers) {
+export function derefLayers(layers) {
     layers = layers.slice();
 
     const map = Object.create(null);