paralayer 1.7.0 → 1.9.0

package/dist/bin.js

@@ -4,7 +4,7 @@
 import minimist from "minimist";
 
 // src/paralayer.ts
-import { Queue, safe, Unit } from "@eposlabs/utils";
+import { Queue, Unit, safe } from "@eposlabs/utils";
 import { watch } from "chokidar";
 import { mkdir, readFile, rm, writeFile } from "fs/promises";
 import { basename, extname, join, relative } from "path";
@@ -112,8 +112,8 @@ var Paralayer = class extends Unit {
     return content.split("export class ").slice(1).map((part) => part.split(" ")[0].split("<")[0]);
   }
   generateLayerContent(layer, layerPaths) {
-    const $LayerName = this.getLayerName(layer, "$Pascal");
-    const $layerName = this.getLayerName(layer, "$camel");
+    const layerName = this.getLayerName(layer, "camel");
+    const LayerName = this.getLayerName(layer, "Pascal");
     const allNames = layerPaths.flatMap((path) => this.files[path]?.names ?? []);
     const imports = layerPaths.map((path) => {
       const file = this.files[path];
@@ -124,16 +124,26 @@ var Paralayer = class extends Unit {
       const relativePath = relative(this.options.output, path);
       return `import { ${[...names, ...types].join(", ")} } from '${relativePath}'`;
     }).filter(Boolean);
-    const assign = [`Object.assign(${$layerName}, {`, ...allNames.map((name) => `  ${name},`), `})`];
+    const assign = [`Object.assign(${layerName}, {`, ...allNames.map((name) => `  ${name},`), `})`];
+    let extendPascal = "";
+    let extendCamel = "";
+    if (this.options.globalLayerName && layer !== this.options.globalLayerName) {
+      extendPascal = `extends ${this.getLayerName(this.options.globalLayerName, "Pascal")} `;
+      extendCamel = `extends ${this.getLayerName(this.options.globalLayerName, "camel")} `;
+    }
     const globals = [
       `declare global {`,
-      `  var ${$layerName}: ${$LayerName}`,
+      `  var ${layerName}: ${LayerName}`,
       ``,
-      `  interface ${$LayerName} {`,
+      `  interface ${LayerName} ${extendPascal}{`,
       ...allNames.map((name) => `    ${name}: typeof ${name}`),
       `  }`,
       ``,
-      `  namespace ${$layerName} {`,
+      `  interface ${layerName} ${extendCamel}{`,
+      ...allNames.map((name) => `    ${name}: ${name}`),
+      `  }`,
+      ``,
+      `  namespace ${layerName} {`,
       ...allNames.map((name) => `    export type ${name} = ${name}Type`),
       `  }`,
       `}`
@@ -145,6 +155,9 @@ var Paralayer = class extends Unit {
       if (layer1.length !== layer2.length) return layer2.length - layer1.length;
       return layer1.localeCompare(layer2);
     }).map((layer) => `import './layer.${layer}.ts'`);
+    if (this.options.globalLayerName && topLayer !== this.options.globalLayerName) {
+      imports.unshift(`import './layer.${this.options.globalLayerName}.ts'`);
+    }
     return [...imports].join("\n");
   }
   generateSetupContent(allLayers) {
@@ -153,9 +166,9 @@ var Paralayer = class extends Unit {
       return layer1.localeCompare(layer2);
     });
     const vars = layers.map((layer) => {
-      const $layerName = this.getLayerName(layer, "$camel");
-      if (this.options.globalize) return `globalThis.${$layerName} = {}`;
-      return `const ${$layerName} = {}`;
+      const layerName = this.getLayerName(layer, "camel");
+      if (this.options.globalize) return `globalThis.${layerName} = {}`;
+      return `const ${layerName} = {}`;
     });
     return [...vars].join("\n");
   }
@@ -167,8 +180,8 @@ var Paralayer = class extends Unit {
   }
   getLayerName(layer, style) {
     const LayerName = layer.split(".").map(this.capitalize).join("");
-    if (style === "$camel") return `$${this.decapitalize(LayerName)}`;
-    if (style === "$Pascal") return `$${LayerName}`;
+    if (style === "camel") return this.decapitalize(LayerName);
+    if (style === "Pascal") return LayerName;
     throw this.never;
   }
   capitalize(string) {

package/dist/paralayer.d.ts

@@ -11,6 +11,8 @@ type Options = {
     watch?: boolean;
     /** Whether the layer variables should be exposed globally. */
     globalize?: boolean;
+    /** If provided, other layers will extend this layer. */
+    globalLayerName?: string | null;
     /** If a file name does not have layer tags, default layer name will be used. */
     defaultLayerName?: string | null;
 };

package/dist/paralayer.js

@@ -1,5 +1,5 @@
 // src/paralayer.ts
-import { Queue, safe, Unit } from "@eposlabs/utils";
+import { Queue, Unit, safe } from "@eposlabs/utils";
 import { watch } from "chokidar";
 import { mkdir, readFile, rm, writeFile } from "fs/promises";
 import { basename, extname, join, relative } from "path";
@@ -107,8 +107,8 @@ var Paralayer = class extends Unit {
     return content.split("export class ").slice(1).map((part) => part.split(" ")[0].split("<")[0]);
   }
   generateLayerContent(layer, layerPaths) {
-    const $LayerName = this.getLayerName(layer, "$Pascal");
-    const $layerName = this.getLayerName(layer, "$camel");
+    const layerName = this.getLayerName(layer, "camel");
+    const LayerName = this.getLayerName(layer, "Pascal");
     const allNames = layerPaths.flatMap((path) => this.files[path]?.names ?? []);
     const imports = layerPaths.map((path) => {
       const file = this.files[path];
@@ -119,16 +119,26 @@ var Paralayer = class extends Unit {
       const relativePath = relative(this.options.output, path);
       return `import { ${[...names, ...types].join(", ")} } from '${relativePath}'`;
     }).filter(Boolean);
-    const assign = [`Object.assign(${$layerName}, {`, ...allNames.map((name) => `  ${name},`), `})`];
+    const assign = [`Object.assign(${layerName}, {`, ...allNames.map((name) => `  ${name},`), `})`];
+    let extendPascal = "";
+    let extendCamel = "";
+    if (this.options.globalLayerName && layer !== this.options.globalLayerName) {
+      extendPascal = `extends ${this.getLayerName(this.options.globalLayerName, "Pascal")} `;
+      extendCamel = `extends ${this.getLayerName(this.options.globalLayerName, "camel")} `;
+    }
     const globals = [
       `declare global {`,
-      `  var ${$layerName}: ${$LayerName}`,
+      `  var ${layerName}: ${LayerName}`,
       ``,
-      `  interface ${$LayerName} {`,
+      `  interface ${LayerName} ${extendPascal}{`,
       ...allNames.map((name) => `    ${name}: typeof ${name}`),
       `  }`,
       ``,
-      `  namespace ${$layerName} {`,
+      `  interface ${layerName} ${extendCamel}{`,
+      ...allNames.map((name) => `    ${name}: ${name}`),
+      `  }`,
+      ``,
+      `  namespace ${layerName} {`,
       ...allNames.map((name) => `    export type ${name} = ${name}Type`),
       `  }`,
       `}`
@@ -140,6 +150,9 @@ var Paralayer = class extends Unit {
       if (layer1.length !== layer2.length) return layer2.length - layer1.length;
       return layer1.localeCompare(layer2);
     }).map((layer) => `import './layer.${layer}.ts'`);
+    if (this.options.globalLayerName && topLayer !== this.options.globalLayerName) {
+      imports.unshift(`import './layer.${this.options.globalLayerName}.ts'`);
+    }
     return [...imports].join("\n");
   }
   generateSetupContent(allLayers) {
@@ -148,9 +161,9 @@ var Paralayer = class extends Unit {
       return layer1.localeCompare(layer2);
     });
     const vars = layers.map((layer) => {
-      const $layerName = this.getLayerName(layer, "$camel");
-      if (this.options.globalize) return `globalThis.${$layerName} = {}`;
-      return `const ${$layerName} = {}`;
+      const layerName = this.getLayerName(layer, "camel");
+      if (this.options.globalize) return `globalThis.${layerName} = {}`;
+      return `const ${layerName} = {}`;
     });
     return [...vars].join("\n");
   }
@@ -162,8 +175,8 @@ var Paralayer = class extends Unit {
   }
   getLayerName(layer, style) {
     const LayerName = layer.split(".").map(this.capitalize).join("");
-    if (style === "$camel") return `$${this.decapitalize(LayerName)}`;
-    if (style === "$Pascal") return `$${LayerName}`;
+    if (style === "camel") return this.decapitalize(LayerName);
+    if (style === "Pascal") return LayerName;
     throw this.never;
   }
   capitalize(string) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paralayer",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "type": "module",
   "license": "MIT",
   "author": "imkost",

package/src/paralayer.ts

@@ -1,4 +1,4 @@
-import { Queue, safe, Unit } from '@eposlabs/utils'
+import { Queue, Unit, safe } from '@eposlabs/utils'
 import type { FSWatcher } from 'chokidar'
 import { watch } from 'chokidar'
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
@@ -17,6 +17,8 @@ export type Options = {
   watch?: boolean
   /** Whether the layer variables should be exposed globally. */
   globalize?: boolean
+  /** If provided, other layers will extend this layer. */
+  globalLayerName?: string | null
   /** If a file name does not have layer tags, default layer name will be used. */
   defaultLayerName?: string | null
 }
@@ -172,8 +174,8 @@ export class Paralayer extends Unit {
   }
 
   private generateLayerContent(layer: string, layerPaths: string[]) {
-    const $LayerName = this.getLayerName(layer, '$Pascal')
-    const $layerName = this.getLayerName(layer, '$camel')
+    const layerName = this.getLayerName(layer, 'camel')
+    const LayerName = this.getLayerName(layer, 'Pascal')
     const allNames = layerPaths.flatMap(path => this.files[path]?.names ?? [])
 
     const imports = layerPaths
@@ -188,17 +190,28 @@ export class Paralayer extends Unit {
       })
       .filter(Boolean)
 
-    const assign = [`Object.assign(${$layerName}, {`, ...allNames.map(name => `  ${name},`), `})`]
+    const assign = [`Object.assign(${layerName}, {`, ...allNames.map(name => `  ${name},`), `})`]
+
+    let extendPascal = ''
+    let extendCamel = ''
+    if (this.options.globalLayerName && layer !== this.options.globalLayerName) {
+      extendPascal = `extends ${this.getLayerName(this.options.globalLayerName, 'Pascal')} `
+      extendCamel = `extends ${this.getLayerName(this.options.globalLayerName, 'camel')} `
+    }
 
     const globals = [
       `declare global {`,
-      `  var ${$layerName}: ${$LayerName}`,
+      `  var ${layerName}: ${LayerName}`,
       ``,
-      `  interface ${$LayerName} {`,
+      `  interface ${LayerName} ${extendPascal}{`,
       ...allNames.map(name => `    ${name}: typeof ${name}`),
       `  }`,
       ``,
-      `  namespace ${$layerName} {`,
+      `  interface ${layerName} ${extendCamel}{`,
+      ...allNames.map(name => `    ${name}: ${name}`),
+      `  }`,
+      ``,
+      `  namespace ${layerName} {`,
       ...allNames.map(name => `    export type ${name} = ${name}Type`),
       `  }`,
       `}`,
@@ -216,6 +229,10 @@ export class Paralayer extends Unit {
       })
       .map(layer => `import './layer.${layer}.ts'`)
 
+    if (this.options.globalLayerName && topLayer !== this.options.globalLayerName) {
+      imports.unshift(`import './layer.${this.options.globalLayerName}.ts'`)
+    }
+
     return [...imports].join('\n')
   }
 
@@ -226,9 +243,9 @@ export class Paralayer extends Unit {
     })
 
     const vars = layers.map(layer => {
-      const $layerName = this.getLayerName(layer, '$camel')
-      if (this.options.globalize) return `globalThis.${$layerName} = {}`
-      return `const ${$layerName} = {}`
+      const layerName = this.getLayerName(layer, 'camel')
+      if (this.options.globalize) return `globalThis.${layerName} = {}`
+      return `const ${layerName} = {}`
     })
 
     return [...vars].join('\n')
@@ -241,10 +258,10 @@ export class Paralayer extends Unit {
     return this.options.defaultLayerName ?? ''
   }
 
-  private getLayerName(layer: string, style: '$camel' | '$Pascal') {
+  private getLayerName(layer: string, style: 'camel' | 'Pascal') {
     const LayerName = layer.split('.').map(this.capitalize).join('')
-    if (style === '$camel') return `$${this.decapitalize(LayerName)}`
-    if (style === '$Pascal') return `$${LayerName}`
+    if (style === 'camel') return this.decapitalize(LayerName)
+    if (style === 'Pascal') return LayerName
     throw this.never
   }