paralayer 1.10.0 → 1.12.0

package/dist/bin.js

@@ -4,8 +4,8 @@
 import minimist from "minimist";
 
 // src/paralayer.ts
-import { Queue, Unit, safe } from "@eposlabs/utils";
 import { watch } from "chokidar";
+import { Queue, Unit, is, safe } from "dropcap/utils";
 import { mkdir, readFile, rm, writeFile } from "fs/promises";
 import { basename, extname, join, relative } from "path";
 var Paralayer = class extends Unit {
@@ -30,10 +30,10 @@ var Paralayer = class extends Unit {
     this.watcher.on("all", this.onAll);
     this.watcher.on("ready", this.onReady);
     await this.ready$.promise;
-    await this.queue.run(() => this.build());
+    await this.queue.add(() => this.build());
     if (!this.options.watch) await this.watcher.close();
-    const setupJsPath = join(this.options.output, "setup.js");
-    return await readFile(setupJsPath, "utf-8");
+    const defineJsPath = join(this.options.output, "define.js");
+    return await readFile(defineJsPath, "utf-8");
   }
   // ---------------------------------------------------------------------------
   // HANDLERS
@@ -49,11 +49,11 @@ var Paralayer = class extends Unit {
     }
     if (event === "unlink") {
       delete this.files[path];
-      await this.queue.run(() => this.build());
+      await this.queue.add(() => this.build());
     }
     if (event === "add" || event === "change") {
       this.files[path] = null;
-      await this.queue.run(() => this.build());
+      await this.queue.add(() => this.build());
     }
   };
   onReady = async () => {
@@ -98,16 +98,16 @@ var Paralayer = class extends Unit {
         await rm(indexFile);
       }
     }
-    const setupFile = join(this.options.output, "setup.js");
-    const setupContent = this.generateSetupContent(allLayers);
-    await this.write(setupFile, setupContent);
+    const defineFile = join(this.options.output, "define.js");
+    const defineContent = this.generateDefineContent(allLayers);
+    await this.write(defineFile, defineContent);
   }
   // ---------------------------------------------------------------------------
   // HELPERS
   // ---------------------------------------------------------------------------
   extractExportedClassNames(content) {
     if (content.includes("paralayer-ignore")) return [];
-    return content.split("export class ").slice(1).map((part) => part.split(" ")[0].split("<")[0]);
+    return content.split(/^export class /m).slice(1).map((part) => part.split(" ")[0]?.split("<")[0]).filter(is.present);
   }
   generateLayerContent(layer, layerPaths) {
     const layerName = this.getLayerName(layer, "camel");
@@ -158,7 +158,7 @@ var Paralayer = class extends Unit {
     }
     return [...imports].join("\n");
   }
-  generateSetupContent(allLayers) {
+  generateDefineContent(allLayers) {
     const layers = allLayers.toSorted((layer1, layer2) => {
       if (layer1.length !== layer2.length) return layer1.length - layer2.length;
       return layer1.localeCompare(layer2);
@@ -180,7 +180,7 @@ var Paralayer = class extends Unit {
     const LayerName = layer.split(".").map(this.capitalize).join("");
     if (style === "camel") return this.decapitalize(LayerName);
     if (style === "Pascal") return LayerName;
-    throw this.never;
+    throw this.never();
   }
   capitalize(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
@@ -198,8 +198,8 @@ var Paralayer = class extends Unit {
   }
 };
 async function paralayer(options) {
-  const setupLayersJs = await new Paralayer(options).start();
-  return setupLayersJs;
+  const defineLayersJs = await new Paralayer(options).start();
+  return defineLayersJs;
 }
 
 // src/bin.ts

package/dist/paralayer.d.ts

@@ -1,4 +1,4 @@
-import { Unit } from '@eposlabs/utils';
+import { Unit } from 'dropcap/utils';
 
 type DirPath = string;
 type File = {
@@ -34,7 +34,7 @@ declare class Paralayer extends Unit {
     private extractExportedClassNames;
     private generateLayerContent;
     private generateIndexContent;
-    private generateSetupContent;
+    private generateDefineContent;
     private getLayer;
     private getLayerName;
     private capitalize;

package/dist/paralayer.js

@@ -1,6 +1,6 @@
 // src/paralayer.ts
-import { Queue, Unit, safe } from "@eposlabs/utils";
 import { watch } from "chokidar";
+import { Queue, Unit, is, safe } from "dropcap/utils";
 import { mkdir, readFile, rm, writeFile } from "fs/promises";
 import { basename, extname, join, relative } from "path";
 var Paralayer = class extends Unit {
@@ -25,10 +25,10 @@ var Paralayer = class extends Unit {
     this.watcher.on("all", this.onAll);
     this.watcher.on("ready", this.onReady);
     await this.ready$.promise;
-    await this.queue.run(() => this.build());
+    await this.queue.add(() => this.build());
     if (!this.options.watch) await this.watcher.close();
-    const setupJsPath = join(this.options.output, "setup.js");
-    return await readFile(setupJsPath, "utf-8");
+    const defineJsPath = join(this.options.output, "define.js");
+    return await readFile(defineJsPath, "utf-8");
   }
   // ---------------------------------------------------------------------------
   // HANDLERS
@@ -44,11 +44,11 @@ var Paralayer = class extends Unit {
     }
     if (event === "unlink") {
       delete this.files[path];
-      await this.queue.run(() => this.build());
+      await this.queue.add(() => this.build());
     }
     if (event === "add" || event === "change") {
       this.files[path] = null;
-      await this.queue.run(() => this.build());
+      await this.queue.add(() => this.build());
     }
   };
   onReady = async () => {
@@ -93,16 +93,16 @@ var Paralayer = class extends Unit {
         await rm(indexFile);
       }
     }
-    const setupFile = join(this.options.output, "setup.js");
-    const setupContent = this.generateSetupContent(allLayers);
-    await this.write(setupFile, setupContent);
+    const defineFile = join(this.options.output, "define.js");
+    const defineContent = this.generateDefineContent(allLayers);
+    await this.write(defineFile, defineContent);
   }
   // ---------------------------------------------------------------------------
   // HELPERS
   // ---------------------------------------------------------------------------
   extractExportedClassNames(content) {
     if (content.includes("paralayer-ignore")) return [];
-    return content.split("export class ").slice(1).map((part) => part.split(" ")[0].split("<")[0]);
+    return content.split(/^export class /m).slice(1).map((part) => part.split(" ")[0]?.split("<")[0]).filter(is.present);
   }
   generateLayerContent(layer, layerPaths) {
     const layerName = this.getLayerName(layer, "camel");
@@ -153,7 +153,7 @@ var Paralayer = class extends Unit {
     }
     return [...imports].join("\n");
   }
-  generateSetupContent(allLayers) {
+  generateDefineContent(allLayers) {
     const layers = allLayers.toSorted((layer1, layer2) => {
       if (layer1.length !== layer2.length) return layer1.length - layer2.length;
       return layer1.localeCompare(layer2);
@@ -175,7 +175,7 @@ var Paralayer = class extends Unit {
     const LayerName = layer.split(".").map(this.capitalize).join("");
     if (style === "camel") return this.decapitalize(LayerName);
     if (style === "Pascal") return LayerName;
-    throw this.never;
+    throw this.never();
   }
   capitalize(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
@@ -193,8 +193,8 @@ var Paralayer = class extends Unit {
   }
 };
 async function paralayer(options) {
-  const setupLayersJs = await new Paralayer(options).start();
-  return setupLayersJs;
+  const defineLayersJs = await new Paralayer(options).start();
+  return defineLayersJs;
 }
 var paralayer_default = paralayer;
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paralayer",
-  "version": "1.10.0",
+  "version": "1.12.0",
   "type": "module",
   "license": "MIT",
   "author": "imkost",
@@ -19,22 +19,16 @@
     "paralayer": "./src/bin.js"
   },
   "exports": {
-    ".": {
-      "source": "./src/paralayer.ts",
-      "import": "./dist/paralayer.js",
-      "types": "./dist/paralayer.d.ts"
-    },
-    "./ts": {
-      "import": "./src/paralayer.ts"
-    }
+    ".": "./dist/paralayer.js",
+    "./ts": "./src/paralayer.ts"
   },
   "files": [
     "src",
     "dist"
   ],
   "dependencies": {
-    "@eposlabs/utils": "^1.10.0",
-    "chokidar": "^4.0.3",
+    "chokidar": "^5.0.0",
+    "dropcap": "^1.0.0",
     "minimist": "^1.2.8"
   },
   "devDependencies": {

package/src/paralayer.ts

@@ -1,6 +1,5 @@
-import { Queue, Unit, safe } from '@eposlabs/utils'
-import type { FSWatcher } from 'chokidar'
-import { watch } from 'chokidar'
+import { watch, type FSWatcher } from 'chokidar'
+import { Queue, Unit, is, safe } from 'dropcap/utils'
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { basename, extname, join, relative } from 'node:path'
 
@@ -50,12 +49,12 @@ export class Paralayer extends Unit {
     this.watcher.on('ready', this.onReady)
 
     await this.ready$.promise
-    await this.queue.run(() => this.build())
+    await this.queue.add(() => this.build())
     if (!this.options.watch) await this.watcher.close()
 
-    // Return content of setup.js
-    const setupJsPath = join(this.options.output, 'setup.js')
-    return await readFile(setupJsPath, 'utf-8')
+    // Return content of define.js
+    const defineJsPath = join(this.options.output, 'define.js')
+    return await readFile(defineJsPath, 'utf-8')
   }
 
   // ---------------------------------------------------------------------------
@@ -82,13 +81,13 @@ export class Paralayer extends Unit {
     // File removed? -> Remove and rebuild
     if (event === 'unlink') {
       delete this.files[path]
-      await this.queue.run(() => this.build())
+      await this.queue.add(() => this.build())
     }
 
     // File added/changed? -> Reset its content and rebuild
     if (event === 'add' || event === 'change') {
       this.files[path] = null
-      await this.queue.run(() => this.build())
+      await this.queue.add(() => this.build())
     }
   }
 
@@ -154,10 +153,10 @@ export class Paralayer extends Unit {
       }
     }
 
-    // Generate setup.js file
-    const setupFile = join(this.options.output, 'setup.js')
-    const setupContent = this.generateSetupContent(allLayers)
-    await this.write(setupFile, setupContent)
+    // Generate define.js file
+    const defineFile = join(this.options.output, 'define.js')
+    const defineContent = this.generateDefineContent(allLayers)
+    await this.write(defineFile, defineContent)
   }
 
   // ---------------------------------------------------------------------------
@@ -167,9 +166,10 @@ export class Paralayer extends Unit {
   private extractExportedClassNames(content: string) {
     if (content.includes('paralayer-ignore')) return []
     return content
-      .split('export class ')
+      .split(/^export class /m)
       .slice(1)
-      .map(part => part.split(' ')[0].split('<')[0])
+      .map(part => part.split(' ')[0]?.split('<')[0])
+      .filter(is.present)
   }
 
   private generateLayerContent(layer: string, layerPaths: string[]) {
@@ -235,7 +235,7 @@ export class Paralayer extends Unit {
     return [...imports].join('\n')
   }
 
-  private generateSetupContent(allLayers: string[]) {
+  private generateDefineContent(allLayers: string[]) {
     const layers = allLayers.toSorted((layer1, layer2) => {
       if (layer1.length !== layer2.length) return layer1.length - layer2.length
       return layer1.localeCompare(layer2)
@@ -261,7 +261,7 @@ export class Paralayer extends Unit {
     const LayerName = layer.split('.').map(this.capitalize).join('')
     if (style === 'camel') return this.decapitalize(LayerName)
     if (style === 'Pascal') return LayerName
-    throw this.never
+    throw this.never()
   }
 
   private capitalize(string: string) {
@@ -284,8 +284,8 @@ export class Paralayer extends Unit {
 }
 
 export async function paralayer(options: Options) {
-  const setupLayersJs = await new Paralayer(options).start()
-  return setupLayersJs
+  const defineLayersJs = await new Paralayer(options).start()
+  return defineLayersJs
 }
 
 export default paralayer