@o3r/design 11.1.0-prerelease.2 → 11.1.0-prerelease.20

package/builders/generate-css/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../builders/generate-css/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAiB5D;;;GAGG;;AACH,wBAsHG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../builders/generate-css/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAiB5D;;;GAGG;;AACH,wBA+HG"}

package/builders/generate-css/index.js

@@ -11,7 +11,7 @@ const node_os_1 = require("node:os");
  */
 exports.default = (0, architect_1.createBuilder)(async (options, context) => {
     const designTokenFilePatterns = Array.isArray(options.designTokenFilePatterns) ? options.designTokenFilePatterns : [options.designTokenFilePatterns];
-    const determineCssFileToUpdate = options.output ? () => (0, node_path_1.resolve)(context.workspaceRoot, options.output) :
+    const determineFileToUpdate = options.output ? () => (0, node_path_1.resolve)(context.workspaceRoot, options.output) :
         (token) => {
             if (token.extensions.o3rTargetFile) {
                 return token.context?.basePath && !options.rootPath ?
@@ -27,7 +27,7 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
         logger
     });
     const renderDesignTokenOptionsCss = {
-        determineFileToUpdate: determineCssFileToUpdate,
+        determineFileToUpdate,
         tokenDefinitionRenderer: (0, public_api_1.getCssTokenDefinitionRenderer)({
             tokenVariableNameRenderer,
             privateDefinitionRenderer: options.renderPrivateVariableTo === 'sass' ? sassRenderer : undefined,
@@ -39,6 +39,14 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
         }),
         logger
     };
+    const renderDesignTokenOptionsSass = {
+        determineFileToUpdate,
+        tokenDefinitionRenderer: (0, public_api_1.getSassTokenDefinitionRenderer)({
+            tokenVariableNameRenderer: (v) => (options?.prefix || '') + (0, public_api_1.tokenVariableNameSassRenderer)(v),
+            logger
+        }),
+        logger
+    };
     const renderDesignTokenOptionsMetadata = {
         determineFileToUpdate: () => (0, node_path_1.resolve)(context.workspaceRoot, options.metadataOutput),
         styleContentUpdater: (0, public_api_1.getMetadataStyleContentUpdater)(),
@@ -84,7 +92,7 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
     };
     const executeMultiRenderer = async () => {
         return (await Promise.allSettled([
-            execute(renderDesignTokenOptionsCss),
+            execute(options.variableType === 'sass' ? renderDesignTokenOptionsSass : renderDesignTokenOptionsCss),
             ...(options.metadataOutput ? [execute(renderDesignTokenOptionsMetadata)] : [])
         ])).reduce((acc, res) => {
             if (res.status === 'fulfilled') {

package/builders/generate-css/schema.d.ts

@@ -30,5 +30,7 @@ export interface GenerateCssSchematicsSchema extends SchematicOptionObject {
     prefixPrivate?: string;
     /** Determine if the builder should fail if a missing Design Token reference is detected */
     failOnMissingReference?: boolean;
+    /** Type of the variables to generate for a Design Token */
+    variableType?: 'css' | 'sass';
 }
 //# sourceMappingURL=schema.d.ts.map

package/builders/generate-css/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../builders/generate-css/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,mDAAmD;IACnD,uBAAuB,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE3C;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,gFAAgF;IAChF,gBAAgB,EAAE,MAAM,CAAC;IAEzB,wBAAwB;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,yDAAyD;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,wEAAwE;IACxE,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,0DAA0D;IAC1D,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,2FAA2F;IAC3F,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../builders/generate-css/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,mDAAmD;IACnD,uBAAuB,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE3C;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,gFAAgF;IAChF,gBAAgB,EAAE,MAAM,CAAC;IAEzB,wBAAwB;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,yDAAyD;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,wEAAwE;IACxE,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,0DAA0D;IAC1D,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,2FAA2F;IAC3F,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC,2DAA2D;IAC3D,YAAY,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC/B"}

package/builders/generate-css/schema.json

@@ -4,6 +4,15 @@
   "title": "Add Otter Design",
   "description": "ngAdd Otter Design",
   "properties": {
+    "variableType": {
+      "type": "string",
+      "enum": [
+        "css",
+        "sass"
+      ],
+      "default": "css",
+      "description": "Type of the variables to generate for a Design Token."
+    },
     "designTokenFilePatterns": {
       "description": "Path patterns to the Design Token JSON files (it supports Node dependency paths).",
       "oneOf": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/design",
-  "version": "11.1.0-prerelease.2",
+  "version": "11.1.0-prerelease.20",
   "publishConfig": {
     "access": "public"
   },
@@ -52,9 +52,9 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@o3r/core": "^11.1.0-prerelease.2",
-    "@o3r/schematics": "^11.1.0-prerelease.2",
-    "@o3r/styling": "^11.1.0-prerelease.2",
+    "@o3r/core": "^11.1.0-prerelease.20",
+    "@o3r/schematics": "^11.1.0-prerelease.20",
+    "@o3r/styling": "^11.1.0-prerelease.20",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
     "sass": "~1.77.0"
@@ -100,27 +100,27 @@
     "@nx/eslint-plugin": "~19.3.0",
     "@nx/jest": "~19.3.0",
     "@nx/js": "~19.3.0",
-    "@o3r/build-helpers": "^11.1.0-prerelease.2",
-    "@o3r/core": "^11.1.0-prerelease.2",
-    "@o3r/eslint-plugin": "^11.1.0-prerelease.2",
-    "@o3r/schematics": "^11.1.0-prerelease.2",
-    "@o3r/styling": "^11.1.0-prerelease.2",
-    "@o3r/test-helpers": "^11.1.0-prerelease.2",
+    "@o3r/build-helpers": "^11.1.0-prerelease.20",
+    "@o3r/core": "^11.1.0-prerelease.20",
+    "@o3r/eslint-plugin": "^11.1.0-prerelease.20",
+    "@o3r/schematics": "^11.1.0-prerelease.20",
+    "@o3r/styling": "^11.1.0-prerelease.20",
+    "@o3r/test-helpers": "^11.1.0-prerelease.20",
     "@schematics/angular": "~18.0.0",
     "@stylistic/eslint-plugin-ts": "^2.0.0",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
-    "@typescript-eslint/utils": "~7.14.1",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
+    "@typescript-eslint/utils": "^7.14.1",
     "chokidar": "^3.5.2",
     "cpy-cli": "^5.0.0",
     "eslint": "^8.57.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-jest": "~28.6.0",
-    "eslint-plugin-jsdoc": "~48.4.0",
+    "eslint-plugin-jsdoc": "~48.7.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "^54.0.0",
     "globby": "^11.1.0",
@@ -133,7 +133,7 @@
     "rxjs": "^7.8.1",
     "sass": "~1.77.0",
     "semver": "^7.5.2",
-    "ts-jest": "~29.1.2",
+    "ts-jest": "~29.2.0",
     "ts-node": "~10.9.2",
     "type-fest": "^4.10.2",
     "typescript": "~5.4.2",