dazscript-framework 1.0.4 → 1.0.5

package/README.md

@@ -32,7 +32,7 @@ DAZ Script gives you direct access to the entire Daz Studio API. The DazScript F
 - **Fast UI development** — a fluent builder API lets you describe dialogs declaratively without touching the Qt widget API by hand.
 - **Two-way data binding** — link your data model to UI controls so they stay in sync automatically. The user types in a field and your model updates; you update the model in code and the UI reflects it instantly. No manual synchronization needed.
 - **One-command build** — `npm run build` compiles TypeScript to `.dsa` files that Daz Studio runs directly.
-- **Stable launcher shims** — built scripts use a two-level layout so iterating on your code never requires reinstalling actions in Daz Studio.
+- **Stable launcher shims** — built scripts use a launcher/implementation layout so iterating on your code never requires reinstalling actions in Daz Studio.
 - **Automated installer generation** — `npm run installer` produces a full setup dialog by reading action metadata from your source code.
 
 ---
@@ -53,7 +53,7 @@ npm install dazscript-framework dazscript-types
 npx dazscript init
 ```
 
-Follow the prompt for your AppData author namespace (e.g. `YourName/my-project`). This creates `dazscript.config.ts`, `tsconfig.json`, and wires the `build`, `watch`, `icons`, and `installer` scripts into `package.json`.
+Follow the prompt for your AppData author namespace (e.g. `YourName/my-project`). This creates `dazscript.config.ts`, `tsconfig.json`, and wires the `build`, `build:encrypted`, `watch`, `encrypt`, `icons`, and `installer` scripts into `package.json`.
 
 ### 3. Write the script
 
@@ -159,7 +159,7 @@ If `--app-data-path` is not provided, `init` prompts for the AppData author name
 This generates:
 - `dazscript.config.ts`
 - `tsconfig.json`
-- `package.json` script wiring for `build`, `watch`, `icons`, and `installer`
+- `package.json` script wiring for `build`, `build:encrypted`, `watch`, `encrypt`, `icons`, and `installer`
 
 Available `init` flags:
 
@@ -244,7 +244,7 @@ action({ text: 'My Script' }, MyScript);
 Each built action produces two files:
 
 - `out/<script>.dsa` — the stable **launcher** registered with Daz Studio (menus, toolbars, shortcuts)
-- `out/<folder>/lib/<script-name>/script.dsa` — the **implementation bundle** the launcher executes
+- `out/<folder>/lib/<script-name>/<script-name>.dsa` — the **implementation bundle** the launcher executes
 
 When you rebuild, only the implementation bundle changes. The launcher path stays stable, so re-registering the action in Daz Studio is normally not required.
 
@@ -256,7 +256,9 @@ To encrypt implementation bundles before packaging, run the build and then call
 npx dazscript encrypt --out-dir ./out --daz-studio "C:/Program Files/DAZ 3D/DAZStudio4/DAZStudio.exe"
 ```
 
-The `encrypt` command launches Daz Studio with `-headless -noPrompt`, converts each `out/**/lib/**/script.dsa` to `script.dse`, and deletes the source `script.dsa` after the matching encrypted file is written. Add `--keep-source` to leave the plain implementation bundles in place.
+The `encrypt` command launches Daz Studio with `-headless -noPrompt`, converts each implementation bundle under `out/**/lib/**/*.dsa` to a matching `.dse` file, and deletes the source `.dsa` after the matching encrypted file is written. Add `--keep-source` to leave the plain implementation bundles in place.
+
+Individual script packages can wrap this command in `package.json` scripts such as `npm run encrypt` or `npm run build:encrypted` so release packaging does not depend on remembering the full Daz Studio executable argument.
 
 ---
 

package/dist/scripts/encrypt.js

@@ -27,8 +27,7 @@ function findImplementationScripts(dir) {
 
       if (
         entry.isFile() &&
-        entry.name === 'script.dsa' &&
-        path.basename(path.dirname(entryPath)) !== 'lib' &&
+        entry.name.endsWith('.dsa') &&
         entryPath.split(path.sep).includes('lib')
       ) {
         scripts.push(entryPath);

package/dist/scripts/init.js

@@ -93,8 +93,10 @@ function updatePackageJson(workdir, options) {
     ...(packageJson.scripts || {}),
     prebuild: 'npm run installer',
     build: 'dazscript build',
+    'build:encrypted': 'npm run build && npm run encrypt',
     postbuild: 'npm run icons',
     watch: 'dazscript watch',
+    encrypt: 'dazscript encrypt --out-dir ./out --daz-studio "C:\\Program Files\\DAZ 3D\\DAZStudio4\\DAZStudio.exe"',
     icons: 'dazscript icons',
     installer: 'dazscript installer',
   };

package/dist/scripts/launchers.js

@@ -23,6 +23,26 @@ function getImplementationRelativePath(outputRelativePath, extension = 'dsa') {
     ? path.posix.join('lib', outputBaseName)
     : path.posix.join(outputDirectory, 'lib', outputBaseName);
 
+  return path.posix.join(implementationDirectory, `${outputBaseName}.${extension}`);
+}
+
+function getFlatImplementationRelativePath(outputRelativePath, extension = 'dsa') {
+  const outputDirectory = path.posix.dirname(outputRelativePath);
+  const outputBaseName = path.posix.basename(outputRelativePath, '.dsa');
+  const implementationDirectory = outputDirectory === '.'
+    ? 'lib'
+    : path.posix.join(outputDirectory, 'lib');
+
+  return path.posix.join(implementationDirectory, `${outputBaseName}.${extension}`);
+}
+
+function getLegacyImplementationRelativePath(outputRelativePath, extension = 'dsa') {
+  const outputDirectory = path.posix.dirname(outputRelativePath);
+  const outputBaseName = path.posix.basename(outputRelativePath, '.dsa');
+  const implementationDirectory = outputDirectory === '.'
+    ? path.posix.join('lib', outputBaseName)
+    : path.posix.join(outputDirectory, 'lib', outputBaseName);
+
   return path.posix.join(implementationDirectory, `script.${extension}`);
 }
 
@@ -89,6 +109,14 @@ function ensureParentDir(filePath) {
   fs.mkdirSync(path.dirname(filePath), { recursive: true });
 }
 
+function removeEmptyDir(dirPath) {
+  try {
+    fs.rmdirSync(dirPath);
+  } catch (_err) {
+    // Directory is missing or still contains user/generated files.
+  }
+}
+
 function createActionLaunchers(workdir, options) {
   const outDir = path.resolve(workdir, options.outDir || './out');
   const appDataPath = validateAppDataPath(options.appDataPath, workdir);
@@ -105,11 +133,34 @@ function createActionLaunchers(workdir, options) {
       outDir,
       getImplementationRelativePath(outputRelativePath, 'dse')
     );
+    const legacyImplementationPath = path.join(
+      outDir,
+      getLegacyImplementationRelativePath(outputRelativePath)
+    );
+    const legacyEncryptedImplementationPath = path.join(
+      outDir,
+      getLegacyImplementationRelativePath(outputRelativePath, 'dse')
+    );
+    const flatImplementationPath = path.join(
+      outDir,
+      getFlatImplementationRelativePath(outputRelativePath)
+    );
+    const flatEncryptedImplementationPath = path.join(
+      outDir,
+      getFlatImplementationRelativePath(outputRelativePath, 'dse')
+    );
 
     if (!fs.existsSync(launcherPath)) {
       return;
     }
 
+    if (path.resolve(launcherPath) === path.resolve(implementationPath)) {
+      throw new Error(
+        `[dazscript] Launcher path collides with implementation path: ${implementationRelativePath}. ` +
+        `Move the source action out of a lib/ folder or use a different script name.`
+      );
+    }
+
     ensureParentDir(implementationPath);
     if (fs.existsSync(implementationPath)) {
       fs.unlinkSync(implementationPath);
@@ -117,6 +168,21 @@ function createActionLaunchers(workdir, options) {
     if (fs.existsSync(encryptedImplementationPath)) {
       fs.unlinkSync(encryptedImplementationPath);
     }
+    if (fs.existsSync(legacyImplementationPath)) {
+      fs.unlinkSync(legacyImplementationPath);
+    }
+    if (fs.existsSync(legacyEncryptedImplementationPath)) {
+      fs.unlinkSync(legacyEncryptedImplementationPath);
+    }
+    if (fs.existsSync(flatImplementationPath)) {
+      fs.unlinkSync(flatImplementationPath);
+    }
+    if (fs.existsSync(flatEncryptedImplementationPath)) {
+      fs.unlinkSync(flatEncryptedImplementationPath);
+    }
+    if (path.resolve(path.dirname(legacyImplementationPath)) !== path.resolve(path.dirname(implementationPath))) {
+      removeEmptyDir(path.dirname(legacyImplementationPath));
+    }
 
     fs.renameSync(launcherPath, implementationPath);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",