@microtronics/studio-cli 0.52.0 → 0.54.0

package/dist/studio-cli.d.ts

@@ -1812,6 +1812,7 @@ export declare namespace DefaultFiles {
             bloPath: string;
             reportTemplate: string;
             definesTs: string;
+            definesAppTs: string;
         };
         dlo: {
             path: string;
@@ -2252,6 +2253,8 @@ export declare namespace Globals {
         definesWithSource: {
             [key: string]: DefineEntry;
         };
+        /** For library projects: defaults-only config without app.ini overrides */
+        defaultsOnly?: ResolvedConfig;
     }
     /**
      * Read all ini files from the project directory and its dependencies.
@@ -2275,7 +2278,7 @@ export declare namespace Globals {
      * @param fs - filesystem abstraction
      * @param resolvedConfig - the resolved config from Globals.read()
      */
-    export function exportDefinesTs(cwd: URI, fs: LocalFS, resolvedConfig: ResolvedConfig): Promise<void>;
+    export function exportDefinesTs(cwd: URI, fs: LocalFS, resolvedConfig: ResolvedConfig, outputPath?: string): Promise<void>;
     /**
      * Replace {{KEY}} template tokens in a string with their resolved values.
      *

package/out/defaultFiles.js

@@ -73,7 +73,8 @@ var DefaultFiles;
             dfilesProperties: `${deployDirectoryName}dfiles/properties.json`,
             bloPath: `${deployDirectoryName}blo`,
             reportTemplate: `${deployDirectoryName}/${DefaultFiles.fileNames.reportTemplate}`,
-            definesTs: `${deployDirectoryName}defines.ts`
+            definesTs: `${deployDirectoryName}defines.ts`,
+            definesAppTs: `${deployDirectoryName}defines.app.ts`
         },
         dlo: {
             path: dloDirectoryName,

package/out/globals.js

@@ -92,11 +92,12 @@ var Globals;
             const defaultsIni = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.defaultsIni);
             await mergeIniFile(fs, defaultsIni, allDefines, sections, definesWithSource);
         }
-        else {
-            const appIni = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.appIni);
-            await mergeIniFile(fs, appIni, allDefines, sections, definesWithSource);
-        }
-        return { flat: allDefines, sections, definesWithSource };
+        // Snapshot defaults-only state before app.ini merge (for library dual-defines)
+        const defaultsOnly = snapshotDefaultsOnly(manifest, allDefines, sections, definesWithSource);
+        // app.ini is always loaded (provides local dev overrides for libraries, main config for apps)
+        const appIni = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.appIni);
+        await mergeIniFile(fs, appIni, allDefines, sections, definesWithSource);
+        return { flat: allDefines, sections, definesWithSource, defaultsOnly };
     }
     Globals.read = read;
     /**
@@ -107,7 +108,7 @@ var Globals;
      * @param fs - filesystem abstraction
      * @param resolvedConfig - the resolved config from Globals.read()
      */
-    async function exportDefinesTs(cwd, fs, resolvedConfig) {
+    async function exportDefinesTs(cwd, fs, resolvedConfig, outputPath) {
         const entries = Object.entries(resolvedConfig.flat);
         // Build the StudioDefines interface members
         const interfaceLines = [];
@@ -150,7 +151,7 @@ var Globals;
         lines.push('');
         lines.push('export {};');
         lines.push('');
-        const definesPath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.dist.definesTs);
+        const definesPath = vscode_uri_1.Utils.joinPath(cwd, outputPath ?? defaultFiles_1.DefaultFiles.filePaths.dist.definesTs);
         await fs.writeFile(definesPath, lines.join('\n'));
     }
     Globals.exportDefinesTs = exportDefinesTs;
@@ -175,6 +176,21 @@ var Globals;
     }
     Globals.replaceDefineTemplates = replaceDefineTemplates;
 })(Globals || (exports.Globals = Globals = {}));
+/**
+ * For library projects, snapshot the current defines state (before app.ini merge)
+ * so the published library only contains defaults.ini values.
+ * Returns undefined for non-library projects.
+ */
+function snapshotDefaultsOnly(manifest, allDefines, sections, definesWithSource) {
+    if (!manifest_1.Manifest.isLibrary(manifest)) {
+        return undefined;
+    }
+    return {
+        flat: { ...allDefines },
+        sections: structuredClone(sections),
+        definesWithSource: { ...definesWithSource }
+    };
+}
 /**
  * Classify a trimmed ini-file line into one of the known kinds.
  * Moves boolean-operator branching out of the main loop to reduce cognitive complexity.

package/out/package/library.js

@@ -46,7 +46,7 @@ const defaultIgnore = [
     '**/.vscode-test/**',
     '**/.vscode-test-web/**'
 ];
-defaultIgnore.push(...['**/.studio/**', '**/node_modules/**', STUDIO_IGNORE_FILE]);
+defaultIgnore.push(...['**/.studio/**', '**/node_modules/**', STUDIO_IGNORE_FILE, 'dist/defines.app.ts']);
 const MINIMATCH_OPTIONS = { dot: true };
 var Library;
 (function (Library) {

package/out/package/package.js

@@ -46,8 +46,7 @@ var Package;
         // Generate dist/defines.ts before POV/BLO builds
         try {
             const resolvedConfig = await globals_1.Globals.read(cwd, fs, logger);
-            await globals_1.Globals.exportDefinesTs(cwd, fs, resolvedConfig);
-            logger.log('Generated', defaultFiles_1.DefaultFiles.filePaths.dist.definesTs);
+            await exportDefinesForProject(cwd, fs, logger, resolvedConfig);
         }
         catch (e) {
             logger.warn('Could not generate defines.ts:', e);
@@ -367,6 +366,26 @@ async function preBuild(cwd, fs, logger, env, apiToken, selectedParts) {
         await dde_1.DDE.fetchPreviousHistoryJson(cwd, fs, logger, env, apiToken);
     }
 }
+/**
+ * Export defines.ts file(s) based on project type.
+ * Library projects get two files: dist/defines.ts (defaults only) and dist/defines.app.ts (full merged).
+ * App/addon/analytics projects get a single dist/defines.ts with all merged values.
+ */
+async function exportDefinesForProject(cwd, fs, logger, resolvedConfig) {
+    if (resolvedConfig.defaultsOnly) {
+        // Library: dist/defines.ts = defaults only (for publishing)
+        await globals_1.Globals.exportDefinesTs(cwd, fs, resolvedConfig.defaultsOnly);
+        logger.log('Generated', defaultFiles_1.DefaultFiles.filePaths.dist.definesTs, '(defaults only)');
+        // Library: dist/defines.app.ts = full merged (for local dev)
+        await globals_1.Globals.exportDefinesTs(cwd, fs, resolvedConfig, defaultFiles_1.DefaultFiles.filePaths.dist.definesAppTs);
+        logger.log('Generated', defaultFiles_1.DefaultFiles.filePaths.dist.definesAppTs, '(with app.ini overrides)');
+    }
+    else {
+        // App/addon/analytics: single merged file
+        await globals_1.Globals.exportDefinesTs(cwd, fs, resolvedConfig);
+        logger.log('Generated', defaultFiles_1.DefaultFiles.filePaths.dist.definesTs);
+    }
+}
 /**
  * Generates all needed files out of the dde declaration
  * @param cwd

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@microtronics/studio-cli",
-	"version": "0.52.0",
+	"version": "0.54.0",
 	"description": "Microtronics Studio CLI Tool",
 	"main": "./out/api.js",
 	"typings": "./dist/studio-cli.d.ts",