paralayer 1.11.0 → 1.12.0

package/dist/bin.js

@@ -5,7 +5,7 @@ import minimist from "minimist";
 
 // src/paralayer.ts
 import { watch } from "chokidar";
-import { Queue, Unit, safe } from "dropcap/utils";
+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 {
@@ -32,8 +32,8 @@ var Paralayer = class extends Unit {
     await this.ready$.promise;
     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
@@ -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);
@@ -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

@@ -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 { watch } from "chokidar";
-import { Queue, Unit, safe } from "dropcap/utils";
+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 {
@@ -27,8 +27,8 @@ var Paralayer = class extends Unit {
     await this.ready$.promise;
     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
@@ -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);
@@ -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.11.0",
+  "version": "1.12.0",
   "type": "module",
   "license": "MIT",
   "author": "imkost",
@@ -19,14 +19,8 @@
     "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",

package/src/paralayer.ts

@@ -1,5 +1,5 @@
 import { watch, type FSWatcher } from 'chokidar'
-import { Queue, Unit, safe } from 'dropcap/utils'
+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'
 
@@ -52,9 +52,9 @@ export class Paralayer extends Unit {
     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')
   }
 
   // ---------------------------------------------------------------------------
@@ -153,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)
   }
 
   // ---------------------------------------------------------------------------
@@ -166,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[]) {
@@ -234,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)
@@ -283,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