@unisphere/nx 1.20.0 → 1.21.2

package/dist/generators/add-application/add-application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-application.d.ts","sourceRoot":"","sources":["../../../src/generators/add-application/add-application.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,IAAI,EAAiB,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AA0EzD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,6BAA6B,uBA6HvC;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"add-application.d.ts","sourceRoot":"","sources":["../../../src/generators/add-application/add-application.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,IAAI,EAAiB,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AA0EzD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,6BAA6B,uBAgIvC;AAED,eAAe,uBAAuB,CAAC"}

package/dist/generators/add-application/add-application.js

@@ -84,6 +84,8 @@ async function addApplicationGenerator(tree, options) {
     // Prepare template variables
     const hasDs = selectedDependencies.includes('ds');
     const hasMui = selectedDependencies.includes('mui') || hasDs;
+    // Find types package (or fallback to core)
+    const typesPackageInfo = (0, utils_1.findTypesOrCorePackageInfo)(tree);
     const templateVariables = {
         htmlPageTitle: options.servingType === 'local-dev-playground'
             ? `${options.runtimeName || 'Runtime'} - Local Dev Application`
@@ -95,7 +97,7 @@ async function addApplicationGenerator(tree, options) {
         ...(0, utils_1.createNameTransforms)(widgetName, 'widgetName'),
         ...(0, utils_1.createNameTransforms)(options.runtimeName || 'runtime', 'runtimeName'),
         tmpl: '',
-        coreAlias: (0, utils_1.findCorePackageAlias)(tree),
+        typesAlias: typesPackageInfo.alias,
     };
     const projectRoot = `unisphere/applications/${userInputApplicationName}`;
     // Check if the application already exists

package/dist/generators/add-application/templates/local-dev-playground/src/app/app.tsx.template

@@ -8,7 +8,7 @@ import { ConfigurationProvider } from './configuration-provider';
 import { UnisphereProvider, UnisphereRuntimeVisual } from '@unisphere/runtime-react';
 import { UnisphereWorkspaceConfig } from '@unisphere/runtime';
 import { UnisphereWorkspaceType } from '@unisphere/runtime';
-import { <%= runtimeName__pascalCase %>Runtime } from '<%= coreAlias %>';
+import { <%= runtimeName__pascalCase %>Runtime } from '<%= typesAlias %>';
 
 
 const Hihi: React.FC = () => {

package/dist/generators/add-package/add-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-package.d.ts","sourceRoot":"","sources":["../../../src/generators/add-package/add-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,IAAI,EAA2B,MAAM,YAAY,CAAC;AAEvF,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAyJrD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,uBA0HnC;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"add-package.d.ts","sourceRoot":"","sources":["../../../src/generators/add-package/add-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,IAAI,EAA2B,MAAM,YAAY,CAAC;AAEvF,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAyJrD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,uBAgInC;AAED,eAAe,mBAAmB,CAAC"}

package/dist/generators/add-package/add-package.js

@@ -159,6 +159,9 @@ async function addPackageGenerator(tree, options) {
     const githubUrl = `https://github.com/${companyName}/${experienceName}`;
     // Resolve @unisphere/runtime version from workspace package.json
     const unisphereRuntimeVersion = resolveUnisphereRuntimeVersion(tree);
+    // Determine which dependencies are selected
+    const hasDs = selectedDependencies.includes('ds');
+    const hasReact = selectedDependencies.includes('react') || hasDs;
     // Prepare template variables
     const templateVariables = {
         scope: options.scope,
@@ -167,6 +170,8 @@ async function addPackageGenerator(tree, options) {
         githubUrl,
         companyName,
         unisphereRuntimeVersion,
+        hasDs,
+        hasReact,
         ...(0, utils_1.createNameTransforms)(userInputPackageName, 'packageName'),
         ...(0, utils_1.createNameTransforms)(experienceName, 'experienceName'),
         ...(0, utils_1.createNameTransforms)(packageJsonName, 'packageJsonName'),

package/dist/generators/add-package/templates/new-package/{tsconfig.lib.json → tsconfig.lib.json.template}

@@ -3,10 +3,10 @@
   "compilerOptions": {
     "outDir": "../../../dist/out-tsc",
     "types": [
-      "node",
-      "@kaltura/ds-react-theme/src/lib/theme.d.ts",
+      "node"<% if (hasDs) { %>,
+      "@kaltura/ds-react-theme/src/lib/theme.d.ts"<% } %><% if (hasReact) { %>,
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts"<% } %>
     ]
   },
   "exclude": [
@@ -19,5 +19,5 @@
     "**/*.spec.jsx",
     "**/*.test.jsx"
   ],
-  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx", "src/index.ts.template"]
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }

package/dist/generators/add-runtime/add-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-runtime.d.ts","sourceRoot":"","sources":["../../../src/generators/add-runtime/add-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,IAAI,EAAiB,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AA6CrD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,uBAiInC;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"add-runtime.d.ts","sourceRoot":"","sources":["../../../src/generators/add-runtime/add-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,IAAI,EAAiB,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AA6CrD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,uBAwInC;AAED,eAAe,mBAAmB,CAAC"}

package/dist/generators/add-runtime/add-runtime.js

@@ -7,14 +7,14 @@ const path = tslib_1.__importStar(require("path"));
 const utils_1 = require("../utils");
 const dependency_config_1 = require("../dependency-config");
 const add_application_1 = require("../add-application/add-application");
-function updateCoreIndexExport(tree, runtimeName) {
-    const coreIndexPath = 'unisphere/packages/core/src/index.ts';
-    if (!tree.exists(coreIndexPath)) {
-        throw new Error(`Core index file not found at ${coreIndexPath}`);
+function updateTypesIndexExport(tree, runtimeName, basePath) {
+    const indexPath = `${basePath}/src/index.ts`;
+    if (!tree.exists(indexPath)) {
+        throw new Error(`Index file not found at ${indexPath}`);
     }
-    const currentContent = tree.read(coreIndexPath, 'utf-8');
+    const currentContent = tree.read(indexPath, 'utf-8');
     if (!currentContent) {
-        throw new Error(`Failed to read content from ${coreIndexPath}`);
+        throw new Error(`Failed to read content from ${indexPath}`);
     }
     const exportLine = `export * from './lib/${runtimeName}-runtime';`;
     // Check if the export already exists
@@ -23,9 +23,11 @@ function updateCoreIndexExport(tree, runtimeName) {
     }
     // Add the export at the end of the file
     const updatedContent = currentContent + '\n' + exportLine;
-    tree.write(coreIndexPath, updatedContent);
+    tree.write(indexPath, updatedContent);
 }
 async function addRuntimeGenerator(tree, options) {
+    // Normalize standalone option - Nx list prompts may return string labels instead of boolean values
+    let isStandalone = options?.standalone === 'yes' ? true : false;
     // Validate and read .unisphere configuration
     const unisphereConfig = (0, utils_1.validateUnisphereConfig)(tree);
     // Validate dependencies
@@ -37,11 +39,12 @@ async function addRuntimeGenerator(tree, options) {
     // Validate and correct runtime naming for React/DS dependencies
     let userInputRuntimeName = (0, devkit_1.names)(options.name).fileName;
     userInputRuntimeName = (0, dependency_config_1.validateReactNaming)(userInputRuntimeName, selectedDependencies);
-    const coreAlias = (0, utils_1.findCorePackageAlias)(tree);
+    // Find types package (or fallback to core)
+    const typesPackageInfo = (0, utils_1.findTypesOrCorePackageInfo)(tree);
     // Prepare template variables
     const templateVariables = {
         companyName,
-        coreAlias,
+        typesAlias: typesPackageInfo.alias,
         // Add all name transformations
         ...(0, utils_1.createNameTransforms)(userInputRuntimeName, 'runtimeName'),
         ...(0, utils_1.createNameTransforms)(widgetName, 'widgetName'),
@@ -53,18 +56,19 @@ async function addRuntimeGenerator(tree, options) {
         throw new Error(`Runtime "${userInputRuntimeName}" already exists at ${projectRoot}.\n` +
             'Please choose a different runtime name or remove the existing runtime first.');
     }
-    // Check if the core runtime types file already exists
-    const coreRuntimeTypesPath = `unisphere/packages/core/src/lib/${userInputRuntimeName}-runtime/runtime-types.ts`;
-    if (tree.exists(coreRuntimeTypesPath)) {
-        throw new Error(`Runtime types file "${userInputRuntimeName}-runtime/runtime-types.ts" already exists in core package.\n` +
+    // Check if the runtime types file already exists in types/core package
+    const runtimeTypesPath = `${typesPackageInfo.basePath}/src/lib/${userInputRuntimeName}-runtime/runtime-types.ts`;
+    if (tree.exists(runtimeTypesPath)) {
+        const packageName = typesPackageInfo.hasTypesPackage ? 'types' : 'core';
+        throw new Error(`Runtime types file "${userInputRuntimeName}-runtime/runtime-types.ts" already exists in ${packageName} package.\n` +
             'Please choose a different runtime name or remove the existing file first.');
     }
     // Generate files from templates for the runtime
     (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'templates/new-runtime'), projectRoot, templateVariables);
-    // Generate the runtime types file in the core package using template
-    (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'templates/core-templates'), 'unisphere/packages/core/src/lib', templateVariables);
-    // Update core index.ts to export the new runtime types
-    updateCoreIndexExport(tree, userInputRuntimeName);
+    // Generate the runtime types file in the types/core package using template
+    (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'templates/core-templates'), `${typesPackageInfo.basePath}/src/lib`, templateVariables);
+    // Update types/core index.ts to export the new runtime types
+    updateTypesIndexExport(tree, userInputRuntimeName, typesPackageInfo.basePath);
     // Update .unisphere configuration
     (0, utils_1.updateUnisphereConfig)(tree, 'runtimes', userInputRuntimeName, {
         sourceRoot: `unisphere/runtimes/${userInputRuntimeName}`,
@@ -83,13 +87,14 @@ async function addRuntimeGenerator(tree, options) {
     // if (packageResult && typeof packageResult === 'function') {
     //   packageResult();
     // }
-    // Handle loadedByExternalHost usage - create package and dev application
-    if (options.standalone === true) {
-        // Create an dev application without prompts
+    // Handle standalone usage - create dev application
+    if (isStandalone === true) {
+        // Create a dev application without prompts
         const applicationResult = await (0, add_application_1.addApplicationGenerator)(tree, {
             name: `${userInputRuntimeName}-dev`,
             servingType: 'local-dev-playground',
             runtimeName: userInputRuntimeName,
+            dependencies: selectedDependencies, // Pass same dependencies as runtime
         });
         // Execute the application generation callback if it exists
         if (applicationResult && typeof applicationResult === 'function') {
@@ -106,8 +111,8 @@ async function addRuntimeGenerator(tree, options) {
         devkit_1.logger.info('');
         devkit_1.logger.info(`🚀 Runtime Name: ${userInputRuntimeName}`);
         devkit_1.logger.info(`📁 Location: ${projectRoot}`);
-        devkit_1.logger.info(`🔧 Standalone: ${options.standalone ? 'Yes' : 'No'}`);
-        if (options.standalone === true) {
+        devkit_1.logger.info(`🔧 Standalone: ${isStandalone ? 'Yes' : 'No'}`);
+        if (isStandalone === true) {
             devkit_1.logger.info('');
             devkit_1.logger.info('📦 Additional components created:');
             devkit_1.logger.info(`   • Dev Application: ${userInputRuntimeName}-dev`);

package/dist/generators/add-runtime/schema.d.ts

@@ -1,5 +1,5 @@
 export interface AddRuntimeGeneratorSchema {
   name: string;
-  standalone: boolean;
+  standalone: string;
   dependencies?: string[];
 }

package/dist/generators/add-runtime/schema.json

@@ -11,18 +11,18 @@
       "x-prompt": "What's the runtime name? (letters, numbers, dashes and spaces allowed)"
     },
     "standalone": {
-      "type": "boolean",
+      "type": "string",
       "description": "Is this experience being loaded by the host application, or by another experience (not this one)?",
       "x-prompt": {
         "message": "Is this experience being loaded by the host application, or by another experience (not this one)?",
         "type": "list",
         "items": [
           {
-            "value": true,
+            "value": "yes",
             "label": "Yes -loaded by host application"
           },
           {
-            "value": false,
+            "value": "no",
             "label": "No - loaded by another experience"
           }
         ]

package/dist/generators/add-runtime/templates/new-runtime/src/lib/runtime.tsx.template

@@ -1,6 +1,5 @@
 import * as ReactDOM from 'react-dom/client';
 import { Root } from 'react-dom/client';
-import { ThemeProvider } from '@kaltura/ds-react-theme';
 import {
   CreateElementOptions,
   UnisphereRuntimeBase,
@@ -10,12 +9,9 @@ import {
   <%= runtimeName__pascalCase %>RuntimeName,
   <%= runtimeName__pascalCase %>RuntimeSettings,
   <%= runtimeName__camelCase %>RuntimeSettingsSchema,
-} from '<%= coreAlias %>';
-import {
-  ScopedUnisphereWorkspaceProvider  
-} from '@unisphere/runtime-react';
+} from '<%= typesAlias %>';
 import { HtmlDomRuntimeVisual } from '@unisphere/runtime';
-import { widgetName } from '<%= coreAlias %>'
+import { widgetName } from '<%= typesAlias %>'
 
 export class Runtime
   extends UnisphereRuntimeBase<<%= runtimeName__pascalCase %>RuntimeSettings, Root>

package/dist/generators/add-visual/add-visual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-visual.d.ts","sourceRoot":"","sources":["../../../src/generators/add-visual/add-visual.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,IAAI,EAAE,MAAM,YAAY,CAAC;AAqB9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAkUpD;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAmEf;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"add-visual.d.ts","sourceRoot":"","sources":["../../../src/generators/add-visual/add-visual.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,IAAI,EAAE,MAAM,YAAY,CAAC;AAsB9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAuUpD;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAoEf;AAED,eAAe,kBAAkB,CAAC"}

package/dist/generators/add-visual/add-visual.js

@@ -12,7 +12,7 @@ const visual_utils_1 = require("./visual-utils");
  */
 function addImportToRuntime(sourceFilePath, tree, vars, project) {
     const sourceFile = (0, visual_utils_1.loadSourceFile)(tree, sourceFilePath, project);
-    const { visualName__humanReadable: humanName, runtimeVisualSettings, runtimeVisualSchema, coreAlias, } = vars;
+    const { visualName__humanReadable: humanName, runtimeVisualSettings, runtimeVisualSchema, typesAlias, } = vars;
     // Check if import already exists to prevent duplicates
     const alreadyExists = sourceFile
         .getImportDeclarations()
@@ -26,13 +26,13 @@ function addImportToRuntime(sourceFilePath, tree, vars, project) {
     sourceFile.addImportDeclaration({
         kind: ts_morph_1.StructureKind.ImportDeclaration,
         namedImports: [runtimeVisualSettings, runtimeVisualSchema],
-        moduleSpecifier: coreAlias,
+        moduleSpecifier: typesAlias,
     }); // Explicit cast for clarity
     (0, visual_utils_1.saveSourceFile)(tree, sourceFilePath, sourceFile.getFullText());
     console.log(`✅ Added import for visual ${humanName}`);
 }
-function updateRuntimeIndexExport(tree, runtimeName, visualName) {
-    const runtimeIndexPath = `unisphere/packages/core/src/lib/${runtimeName}-runtime/index.ts`;
+function updateRuntimeIndexExport(tree, runtimeName, visualName, typesPackageInfo) {
+    const runtimeIndexPath = `${typesPackageInfo.basePath}/src/lib/${runtimeName}-runtime/index.ts`;
     if (!tree.exists(runtimeIndexPath)) {
         throw new Error(`Runtime index file not found at ${runtimeIndexPath}`);
     }
@@ -117,7 +117,7 @@ function addVisualTypesToConstructor(sourceFilePath, tree, vars, project, isSing
  * Adds a private render method to the main class in the runtime file.
  * Uses Nx's generateFiles for proper template processing.
  */
-function addRenderMethod(sourceFilePath, tree, vars, project) {
+function addRenderMethod(sourceFilePath, tree, vars, project, typesPackageInfo) {
     const sourceFile = (0, visual_utils_1.loadSourceFile)(tree, sourceFilePath, project);
     const methodName = `_render${vars.visualName__pascalCase}`;
     const clazz = (0, visual_utils_1.findFirstClass)(sourceFile);
@@ -135,7 +135,7 @@ function addRenderMethod(sourceFilePath, tree, vars, project) {
         ...vars,
         tmpl: '', // This removes the .template extension
     });
-    updateRuntimeIndexExport(tree, vars.runtimeName__lowerDashCase, vars.visualName__lowerDashCase);
+    updateRuntimeIndexExport(tree, vars.runtimeName__lowerDashCase, vars.visualName__lowerDashCase, typesPackageInfo);
     // Read the processed template content
     const processedContent = (0, visual_utils_1.readTreeFile)(tree, `${tempDir}/render-method`);
     // Clean up the temporary file
@@ -165,14 +165,15 @@ function addRenderMethod(sourceFilePath, tree, vars, project) {
     console.log(`✅ Added render method ${methodName}.`);
 }
 /**
- * Adds an interface and schema definition to the core runtime types file.
+ * Adds an interface and schema definition to the types/core runtime types file.
  */
-function createVisualTypes(tree, vars) {
-    // Check if the core runtime types file already exists
-    const visualTypesPath = `unisphere/packages/core/src/lib/${vars.runtimeName__lowerDashCase}-runtime/${vars.visualName__lowerDashCase}-visual-types.ts`;
+function createVisualTypes(tree, vars, typesPackageInfo) {
+    // Check if the runtime types file already exists
+    const visualTypesPath = `${typesPackageInfo.basePath}/src/lib/${vars.runtimeName__lowerDashCase}-runtime/${vars.visualName__lowerDashCase}-visual-types.ts`;
+    const packageName = typesPackageInfo.hasTypesPackage ? 'types' : 'core';
     if (tree.exists(visualTypesPath)) {
-        throw new Error(`Visual types file "${vars.visualName__lowerDashCase}-visual-types.ts" already exists in core package.\n` +
-            'Please choose a different runtime name or remove the existing file first.');
+        throw new Error(`Visual types file "${vars.visualName__lowerDashCase}-visual-types.ts" already exists in ${packageName} package.\n` +
+            'Please choose a different visual name or remove the existing file first.');
     }
     const { runtimeVisualSettings: interfaceName, runtimeVisualSchema: schemaName, visualName__humanReadable: humanName, } = vars;
     // Construct the new interface and schema content.
@@ -207,8 +208,8 @@ async function addVisualGenerator(tree, options) {
     // Validate runtime existence and get source root path.
     const runtimeSourceRoot = (0, utils_1.validateRuntimeExists)(tree, runtimeName);
     const runtimeTSxPath = `${runtimeSourceRoot}/src/lib/runtime.tsx`;
-    // Get core package alias and compute various name transforms.
-    const coreAlias = (0, utils_1.findCorePackageAlias)(tree);
+    // Find types package (or fallback to core)
+    const typesPackageInfo = (0, utils_1.findTypesOrCorePackageInfo)(tree);
     const runtimeNames = (0, utils_1.createNameTransforms)(runtimeName, 'runtimeName');
     const visualNames = (0, utils_1.createNameTransforms)(visualName, 'visualName');
     const widgetNames = (0, utils_1.createNameTransforms)(widgetName, 'widgetName');
@@ -222,7 +223,7 @@ async function addVisualGenerator(tree, options) {
         ...widgetNames,
         runtimeVisualSettings,
         runtimeVisualSchema,
-        coreAlias,
+        typesAlias: typesPackageInfo.alias,
     };
     // Ensure the target runtime file exists before proceeding.
     if (!tree.exists(runtimeTSxPath)) {
@@ -237,9 +238,9 @@ async function addVisualGenerator(tree, options) {
     addImportToRuntime(runtimeTSxPath, tree, templateVariables, project);
     addVisualTypesToConstructor(runtimeTSxPath, tree, templateVariables, project, isSingleOccurrence);
     addSwitchCaseToRuntime(runtimeTSxPath, tree, templateVariables, project);
-    addRenderMethod(runtimeTSxPath, tree, templateVariables, project);
-    // 'project' parameter is not needed here as addVariablesInCore directly writes to the tree.
-    createVisualTypes(tree, templateVariables);
+    addRenderMethod(runtimeTSxPath, tree, templateVariables, project, typesPackageInfo);
+    // 'project' parameter is not needed here as createVisualTypes directly writes to the tree.
+    createVisualTypes(tree, templateVariables, typesPackageInfo);
     // Format all modified files for consistent code style.
     await (0, devkit_1.formatFiles)(tree);
     // Log success and summary information to the console.

package/dist/generators/dependency-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-config.d.ts","sourceRoot":"","sources":["../../src/generators/dependency-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAU,MAAM,YAAY,CAAC;AAI1C;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,MAAM,CACjC,MAAM,EACN;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAgDjE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,oBAAoB,EAAE,MAAM,EAAE,GAAG,IAAI,CAkBrE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,oBAAoB,EAAE,MAAM,EAAE,GAC7B,MAAM,CAiBR;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,oBAAoB,EAAE,MAAM,EAAE,GAC7B,IAAI,CA0CN"}
+{"version":3,"file":"dependency-config.d.ts","sourceRoot":"","sources":["../../src/generators/dependency-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAU,MAAM,YAAY,CAAC;AAI1C;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,MAAM,CACjC,MAAM,EACN;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAgDjE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,oBAAoB,EAAE,MAAM,EAAE,GAAG,IAAI,CAkBrE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,oBAAoB,EAAE,MAAM,EAAE,GAC7B,MAAM,CAiBR;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,oBAAoB,EAAE,MAAM,EAAE,GAC7B,IAAI,CA4EN"}

package/dist/generators/dependency-config.js

@@ -100,6 +100,32 @@ function installSelectedDependencies(tree, selectedDependencies) {
     if (!selectedDependencies || selectedDependencies.length === 0) {
         return;
     }
+    // Track processed packages to avoid duplicates (e.g., 'ds' and 'mui' both include @mui/material)
+    const processedPackages = new Set();
+    let hasPackagesToInstall = false;
+    // First pass: check if there's anything to install
+    for (const dep of selectedDependencies) {
+        const depConfig = exports.DEPENDENCY_MAP[dep];
+        if (!depConfig)
+            continue;
+        for (const packageName of depConfig.packages) {
+            if (processedPackages.has(packageName))
+                continue;
+            processedPackages.add(packageName);
+            if (!(0, utils_1.isPackageInstalled)(tree, packageName)) {
+                hasPackagesToInstall = true;
+                break;
+            }
+        }
+        if (hasPackagesToInstall)
+            break;
+    }
+    // If nothing to install, return silently
+    if (!hasPackagesToInstall) {
+        return;
+    }
+    // Reset for second pass
+    processedPackages.clear();
     devkit_1.logger.info('');
     devkit_1.logger.info('📦 Installing selected dependencies...');
     for (const dep of selectedDependencies) {
@@ -109,12 +135,16 @@ function installSelectedDependencies(tree, selectedDependencies) {
             continue;
         }
         for (const packageName of depConfig.packages) {
+            // Skip if already processed (avoid duplicates)
+            if (processedPackages.has(packageName)) {
+                continue;
+            }
+            processedPackages.add(packageName);
             const installedVersion = (0, utils_1.isPackageInstalled)(tree, packageName);
             if (installedVersion) {
-                devkit_1.logger.info(`✅ ${packageName}@${installedVersion} already installed`);
+                // Already installed, skip silently
                 continue;
             }
-            // Determine version to install from defaultVersions map or fallback
             const version = depConfig.defaultVersions?.[packageName] || '^1.0.0';
             const installCommand = `npm install ${packageName}@${version}`;
             devkit_1.logger.info(`   Installing ${packageName}@${version}...`);

package/dist/generators/utils.d.ts

@@ -8,6 +8,24 @@ export declare function updateTsConfigPaths(tree: Tree, pathKey: string, pathVal
 export declare function updateUnisphereConfig(tree: Tree, elementType: 'packages' | 'runtimes' | 'applications', elementName: string, elementConfig: Record<string, any>): void;
 export declare function validateRuntimeExists(tree: Tree, runtimeName: string): string;
 export declare function findCorePackageAlias(tree: Tree): string;
+/**
+ * Tries to find the types package alias in tsconfig.base.json
+ * Returns null if types package is not found
+ */
+export declare function findTypesPackageAlias(tree: Tree): string | null;
+export interface TypesPackageInfo {
+    /** The tsconfig alias for the package (e.g., "@mycompany/types" or "@mycompany/core") */
+    alias: string;
+    /** The base path to the package (e.g., "unisphere/packages/types" or "unisphere/packages/core") */
+    basePath: string;
+    /** Whether the types package exists (true) or falling back to core (false) */
+    hasTypesPackage: boolean;
+}
+/**
+ * Finds the types package if it exists, otherwise falls back to core package.
+ * Returns info about which package to use for runtime types.
+ */
+export declare function findTypesOrCorePackageInfo(tree: Tree): TypesPackageInfo;
 type NameTransformations<Prefix extends string> = {
     [K in `${Prefix}` | `${Prefix}__lowerDashCase` | `${Prefix}__camelCase` | `${Prefix}__pascalCase` | `${Prefix}__constantCase` | `${Prefix}__humanReadable`]: string;
 };

package/dist/generators/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/generators/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAKL,MAAM,YAAY,CAAC;AAGpB,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,eAAe,CAmDnE;AAGD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QA4BjF;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,UAAU,GAAG,UAAU,GAAG,cAAc,EACrD,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QA2BnC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CA6C7E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CA8BvD;AAGD,KAAK,mBAAmB,CAAC,MAAM,SAAS,MAAM,IAAI;KAC/C,CAAC,IACE,GAAG,MAAM,EAAE,GACX,GAAG,MAAM,iBAAiB,GAC1B,GAAG,MAAM,aAAa,GACtB,GAAG,MAAM,cAAc,GACvB,GAAG,MAAM,gBAAgB,GACzB,GAAG,MAAM,iBAAiB,GAAG,MAAM;CACxC,CAAC;AAKF,wBAAgB,oBAAoB,CAAC,MAAM,SAAS,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAczH;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAwBlF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAgB7E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/generators/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAKL,MAAM,YAAY,CAAC;AAGpB,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,eAAe,CAmDnE;AAGD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QA4BjF;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,UAAU,GAAG,UAAU,GAAG,cAAc,EACrD,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QA2BnC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CA6C7E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CA8BvD;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAuB/D;AAED,MAAM,WAAW,gBAAgB;IAC/B,yFAAyF;IACzF,KAAK,EAAE,MAAM,CAAC;IACd,mGAAmG;IACnG,QAAQ,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,gBAAgB,CAkBvE;AAGD,KAAK,mBAAmB,CAAC,MAAM,SAAS,MAAM,IAAI;KAC/C,CAAC,IACE,GAAG,MAAM,EAAE,GACX,GAAG,MAAM,iBAAiB,GAC1B,GAAG,MAAM,aAAa,GACtB,GAAG,MAAM,cAAc,GACvB,GAAG,MAAM,gBAAgB,GACzB,GAAG,MAAM,iBAAiB,GAAG,MAAM;CACxC,CAAC;AAKF,wBAAgB,oBAAoB,CAAC,MAAM,SAAS,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAczH;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAwBlF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAgB7E"}

package/dist/generators/utils.js

@@ -5,6 +5,8 @@ exports.updateTsConfigPaths = updateTsConfigPaths;
 exports.updateUnisphereConfig = updateUnisphereConfig;
 exports.validateRuntimeExists = validateRuntimeExists;
 exports.findCorePackageAlias = findCorePackageAlias;
+exports.findTypesPackageAlias = findTypesPackageAlias;
+exports.findTypesOrCorePackageInfo = findTypesOrCorePackageInfo;
 exports.createNameTransforms = createNameTransforms;
 exports.isPackageInstalled = isPackageInstalled;
 exports.checkIfRuntimeExists = checkIfRuntimeExists;
@@ -144,6 +146,52 @@ function findCorePackageAlias(tree) {
         throw new Error(`Failed to read tsconfig.base.json: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
 }
+/**
+ * Tries to find the types package alias in tsconfig.base.json
+ * Returns null if types package is not found
+ */
+function findTypesPackageAlias(tree) {
+    if (!tree.exists('tsconfig.base.json')) {
+        return null;
+    }
+    try {
+        const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
+        if (!tsconfigBase.compilerOptions?.paths) {
+            return null;
+        }
+        // Find the key that has the value "unisphere/packages/types/src/index.ts"
+        for (const [key, paths] of Object.entries(tsconfigBase.compilerOptions.paths)) {
+            if (Array.isArray(paths) && paths.includes('unisphere/packages/types/src/index.ts')) {
+                return key;
+            }
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Finds the types package if it exists, otherwise falls back to core package.
+ * Returns info about which package to use for runtime types.
+ */
+function findTypesOrCorePackageInfo(tree) {
+    const typesAlias = findTypesPackageAlias(tree);
+    if (typesAlias) {
+        return {
+            alias: typesAlias,
+            basePath: 'unisphere/packages/types',
+            hasTypesPackage: true,
+        };
+    }
+    // Fallback to core package
+    const coreAlias = findCorePackageAlias(tree);
+    return {
+        alias: coreAlias,
+        basePath: 'unisphere/packages/core',
+        hasTypesPackage: false,
+    };
+}
 function createNameTransforms(baseName, prefix) {
     const nameVariants = (0, devkit_1.names)(baseName); // Assuming 'names' function is available and returns NameVariants
     const humanReadable = baseName

package/dist/migrations.json

@@ -1,55 +1,55 @@
 {
-  "migrations": {
+  "generators": {
     "check-nx-version": {
       "version": "1.9.0",
       "description": "Checks that Nx version is 22 or higher",
-      "implementation": "./dist/migrations/update-1-1-5/check-nx-version.js",
+      "factory": "./dist/migrations/update-1-1-5/check-nx-version.js",
       "cli": {
-        "postUpgradeMessage": "✅ Nx version check completed. Your project is using Nx 22 or higher."
+        "postUpdateMessage": "✅ Nx version check completed. Your project is using Nx 22 or higher."
       }
     },
     "rename-widgetname-to-widgetname": {
       "version": "1.9.0",
       "description": "Changes the executor name from WidgetName to widgetName",
-      "implementation": "./dist/migrations/update-1-1-5/rename-widgetname-to-widgetname.js"
+      "factory": "./dist/migrations/update-1-1-5/rename-widgetname-to-widgetname.js"
     },
     "fix-playground-apps": {
       "version": "1.9.0",
       "description": "Fixes playground apps",
-      "implementation": "./dist/migrations/update-1-1-5/fix-playground-apps.js"
+      "factory": "./dist/migrations/update-1-1-5/fix-playground-apps.js"
     },
     "move-runtime-info-to-core": {
       "version": "1.9.0",
       "description": "Moves runtime-information.ts and runtime-settings.ts to core package",
-      "implementation": "./dist/migrations/update-1-1-5/move-runtime-info-to-core.js"
+      "factory": "./dist/migrations/update-1-1-5/move-runtime-info-to-core.js"
     },
     "sync-package-json-files": {
       "version": "1.9.0",
       "description": "Syncs package json files",
-      "implementation": "./dist/migrations/update-1-1-5/sync-package-json-files.js"
+      "factory": "./dist/migrations/update-1-1-5/sync-package-json-files.js"
     },
     "update-nvmrc": {
       "version": "1.9.0",
       "description": "Updates .nvmrc to Node 24 (creates if missing)",
-      "implementation": "./dist/migrations/update-1-1-5/update-nvmrc.js",
+      "factory": "./dist/migrations/update-1-1-5/update-nvmrc.js",
       "cli": {
-        "postUpgradeMessage": "✅ .nvmrc has been updated to Node 24. Please ensure you have Node.js 24.x installed."
+        "postUpdateMessage": "✅ .nvmrc has been updated to Node 24. Please ensure you have Node.js 24.x installed."
       }
     },
     "fix-dependency-versions": {
       "version": "1.9.0",
       "description": "Removes ^ from @changesets/cli version in package.json",
-      "implementation": "./dist/migrations/update-1-1-5/fix-dependency-versions.js",
+      "factory": "./dist/migrations/update-1-1-5/fix-dependency-versions.js",
       "cli": {
-        "postUpgradeMessage": "✅ @changesets/cli version has been pinned to exact version (^ removed)."
+        "postUpdateMessage": "✅ @changesets/cli version has been pinned to exact version (^ removed)."
       }
     },
     "update-github-workflow": {
       "version": "1.9.0",
       "description": "Updates .github/workflows/cicd.yml from template",
-      "implementation": "./dist/migrations/update-1-1-5/update-github-workflow.js",
+      "factory": "./dist/migrations/update-1-1-5/update-github-workflow.js",
       "cli": {
-        "postUpgradeMessage": "✅ GitHub workflow updated to use Node.js 24. Review .github/workflows/cicd.yml if you have custom changes."
+        "postUpdateMessage": "✅ GitHub workflow updated to use Node.js 24. Review .github/workflows/cicd.yml if you have custom changes."
       }
     }
   },
@@ -163,4 +163,4 @@
       }
     }
   }
-}
+}

package/migrations.json

@@ -1,55 +1,55 @@
 {
-  "migrations": {
+  "generators": {
     "check-nx-version": {
       "version": "1.9.0",
       "description": "Checks that Nx version is 22 or higher",
-      "implementation": "./dist/migrations/update-1-1-5/check-nx-version.js",
+      "factory": "./dist/migrations/update-1-1-5/check-nx-version.js",
       "cli": {
-        "postUpgradeMessage": "✅ Nx version check completed. Your project is using Nx 22 or higher."
+        "postUpdateMessage": "✅ Nx version check completed. Your project is using Nx 22 or higher."
       }
     },
     "rename-widgetname-to-widgetname": {
       "version": "1.9.0",
       "description": "Changes the executor name from WidgetName to widgetName",
-      "implementation": "./dist/migrations/update-1-1-5/rename-widgetname-to-widgetname.js"
+      "factory": "./dist/migrations/update-1-1-5/rename-widgetname-to-widgetname.js"
     },
     "fix-playground-apps": {
       "version": "1.9.0",
       "description": "Fixes playground apps",
-      "implementation": "./dist/migrations/update-1-1-5/fix-playground-apps.js"
+      "factory": "./dist/migrations/update-1-1-5/fix-playground-apps.js"
     },
     "move-runtime-info-to-core": {
       "version": "1.9.0",
       "description": "Moves runtime-information.ts and runtime-settings.ts to core package",
-      "implementation": "./dist/migrations/update-1-1-5/move-runtime-info-to-core.js"
+      "factory": "./dist/migrations/update-1-1-5/move-runtime-info-to-core.js"
     },
     "sync-package-json-files": {
       "version": "1.9.0",
       "description": "Syncs package json files",
-      "implementation": "./dist/migrations/update-1-1-5/sync-package-json-files.js"
+      "factory": "./dist/migrations/update-1-1-5/sync-package-json-files.js"
     },
     "update-nvmrc": {
       "version": "1.9.0",
       "description": "Updates .nvmrc to Node 24 (creates if missing)",
-      "implementation": "./dist/migrations/update-1-1-5/update-nvmrc.js",
+      "factory": "./dist/migrations/update-1-1-5/update-nvmrc.js",
       "cli": {
-        "postUpgradeMessage": "✅ .nvmrc has been updated to Node 24. Please ensure you have Node.js 24.x installed."
+        "postUpdateMessage": "✅ .nvmrc has been updated to Node 24. Please ensure you have Node.js 24.x installed."
       }
     },
     "fix-dependency-versions": {
       "version": "1.9.0",
       "description": "Removes ^ from @changesets/cli version in package.json",
-      "implementation": "./dist/migrations/update-1-1-5/fix-dependency-versions.js",
+      "factory": "./dist/migrations/update-1-1-5/fix-dependency-versions.js",
       "cli": {
-        "postUpgradeMessage": "✅ @changesets/cli version has been pinned to exact version (^ removed)."
+        "postUpdateMessage": "✅ @changesets/cli version has been pinned to exact version (^ removed)."
       }
     },
     "update-github-workflow": {
       "version": "1.9.0",
       "description": "Updates .github/workflows/cicd.yml from template",
-      "implementation": "./dist/migrations/update-1-1-5/update-github-workflow.js",
+      "factory": "./dist/migrations/update-1-1-5/update-github-workflow.js",
       "cli": {
-        "postUpgradeMessage": "✅ GitHub workflow updated to use Node.js 24. Review .github/workflows/cicd.yml if you have custom changes."
+        "postUpdateMessage": "✅ GitHub workflow updated to use Node.js 24. Review .github/workflows/cicd.yml if you have custom changes."
       }
     }
   },
@@ -163,4 +163,4 @@
       }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unisphere/nx",
-  "version": "1.20.0",
+  "version": "1.21.2",
   "private": false,
   "main": "./dist/index.js",
   "module": "./dist/index.js",