@o3r/design 11.3.0-prerelease.13 → 11.3.0-prerelease.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/package.json +10 -10
  2. package/src/core/design-token/renderers/metadata/design-token-definition.renderers.d.ts.map +1 -1
  3. package/src/core/design-token/renderers/metadata/design-token-definition.renderers.js +3 -2
  4. package/src/core/design-token/renderers/metadata/design-token-definition.renderers.js.map +1 -1
  5. package/src/core/design-token/renderers/metadata/design-token-value.renderers.d.ts +2 -0
  6. package/src/core/design-token/renderers/metadata/design-token-value.renderers.d.ts.map +1 -1
  7. package/src/core/design-token/renderers/metadata/design-token-value.renderers.js +20 -1
  8. package/src/core/design-token/renderers/metadata/design-token-value.renderers.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/design",
3
- "version": "11.3.0-prerelease.13",
3
+ "version": "11.3.0-prerelease.15",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -53,9 +53,9 @@
53
53
  "tslib": "^2.6.2"
54
54
  },
55
55
  "peerDependencies": {
56
- "@o3r/core": "^11.3.0-prerelease.13",
57
- "@o3r/schematics": "^11.3.0-prerelease.13",
58
- "@o3r/styling": "^11.3.0-prerelease.13",
56
+ "@o3r/core": "^11.3.0-prerelease.15",
57
+ "@o3r/schematics": "^11.3.0-prerelease.15",
58
+ "@o3r/styling": "^11.3.0-prerelease.15",
59
59
  "chokidar": "^3.5.2",
60
60
  "globby": "^11.1.0",
61
61
  "sass": "~1.78.0"
@@ -101,12 +101,12 @@
101
101
  "@nx/eslint-plugin": "~19.5.0",
102
102
  "@nx/jest": "~19.5.0",
103
103
  "@nx/js": "~19.5.0",
104
- "@o3r/build-helpers": "^11.3.0-prerelease.13",
105
- "@o3r/core": "^11.3.0-prerelease.13",
106
- "@o3r/eslint-plugin": "^11.3.0-prerelease.13",
107
- "@o3r/schematics": "^11.3.0-prerelease.13",
108
- "@o3r/styling": "^11.3.0-prerelease.13",
109
- "@o3r/test-helpers": "^11.3.0-prerelease.13",
104
+ "@o3r/build-helpers": "^11.3.0-prerelease.15",
105
+ "@o3r/core": "^11.3.0-prerelease.15",
106
+ "@o3r/eslint-plugin": "^11.3.0-prerelease.15",
107
+ "@o3r/schematics": "^11.3.0-prerelease.15",
108
+ "@o3r/styling": "^11.3.0-prerelease.15",
109
+ "@o3r/test-helpers": "^11.3.0-prerelease.15",
110
110
  "@schematics/angular": "~18.2.0",
111
111
  "@stylistic/eslint-plugin-ts": "~2.4.0",
112
112
  "@types/jest": "~29.5.2",
package/src/core/design-token/renderers/metadata/design-token-definition.renderers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"design-token-definition.renderers.d.ts","sourceRoot":"","sources":["../../../../../../src/core/design-token/renderers/metadata/design-token-definition.renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgC,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAEtI,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAIlF,6DAA6D;AAC7D,MAAM,WAAW,sCAAsC;IACrD,yCAAyC;IACzC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC;;OAEG;IACH,yBAAyB,CAAC,EAAE,gBAAgB,CAAC;IAE7C,0DAA0D;IAC1D,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,kCAAkC,aAAc,sCAAsC,KAAG,uBAYrG,CAAC"}
1
+ {"version":3,"file":"design-token-definition.renderers.d.ts","sourceRoot":"","sources":["../../../../../../src/core/design-token/renderers/metadata/design-token-definition.renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgC,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAEtI,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAIlF,6DAA6D;AAC7D,MAAM,WAAW,sCAAsC;IACrD,yCAAyC;IACzC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC;;OAEG;IACH,yBAAyB,CAAC,EAAE,gBAAgB,CAAC;IAE7C,0DAA0D;IAC1D,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,kCAAkC,aAAc,sCAAsC,KAAG,uBAarG,CAAC"}
package/src/core/design-token/renderers/metadata/design-token-definition.renderers.js CHANGED
@@ -31,9 +31,10 @@ const design_token_value_renderers_1 = require("./design-token-value.renderers")
31
31
  */
32
32
  const getMetadataTokenDefinitionRenderer = (options) => {
33
33
  const tokenVariableNameRenderer = options?.tokenVariableNameRenderer;
34
- const tokenValueRenderer = options?.tokenValueRenderer || (0, design_token_value_renderers_1.getMetadataTokenValueRenderer)({ tokenVariableNameRenderer });
34
+ const ignorePrivateVariable = options?.ignorePrivateVariable;
35
+ const tokenValueRenderer = options?.tokenValueRenderer || (0, design_token_value_renderers_1.getMetadataTokenValueRenderer)({ tokenVariableNameRenderer, ignorePrivateVariable });
35
36
  const renderer = (variable, variableSet) => {
36
- if (options?.ignorePrivateVariable && (0, design_token_renderer_helpers_1.isO3rPrivateVariable)(variable)) {
37
+ if (ignorePrivateVariable && (0, design_token_renderer_helpers_1.isO3rPrivateVariable)(variable)) {
37
38
  return undefined;
38
39
  }
39
40
  const variableValue = tokenValueRenderer(variable, variableSet);
package/src/core/design-token/renderers/metadata/design-token-definition.renderers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"design-token-definition.renderers.js","sourceRoot":"","sources":["../../../../../../src/core/design-token/renderers/metadata/design-token-definition.renderers.ts"],"names":[],"mappings":";;;AACA,oFAAwE;AAExE,iFAA+E;AAiB/E;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,MAAM,kCAAkC,GAAG,CAAC,OAAgD,EAA2B,EAAE;IAC9H,MAAM,yBAAyB,GAAG,OAAO,EAAE,yBAAyB,CAAC;IACrE,MAAM,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,IAAI,IAAA,4DAA6B,EAAC,EAAE,yBAAyB,EAAE,CAAC,CAAC;IAEvH,MAAM,QAAQ,GAAG,CAAC,QAAsC,EAAE,WAAsD,EAAE,EAAE;QAClH,IAAI,OAAO,EAAE,qBAAqB,IAAI,IAAA,oDAAoB,EAAC,QAAQ,CAAC,EAAE,CAAC;YACrE,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAChE,OAAO,IAAK,IAAI,CAAC,KAAK,CAAC,aAAa,CAAiB,CAAC,IAAI,MAAM,aAAa,EAAE,CAAC;IAClF,CAAC,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAZW,QAAA,kCAAkC,sCAY7C"}
1
+ {"version":3,"file":"design-token-definition.renderers.js","sourceRoot":"","sources":["../../../../../../src/core/design-token/renderers/metadata/design-token-definition.renderers.ts"],"names":[],"mappings":";;;AACA,oFAAwE;AAExE,iFAA+E;AAiB/E;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,MAAM,kCAAkC,GAAG,CAAC,OAAgD,EAA2B,EAAE;IAC9H,MAAM,yBAAyB,GAAG,OAAO,EAAE,yBAAyB,CAAC;IACrE,MAAM,qBAAqB,GAAG,OAAO,EAAE,qBAAqB,CAAC;IAC7D,MAAM,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,IAAI,IAAA,4DAA6B,EAAC,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAE9I,MAAM,QAAQ,GAAG,CAAC,QAAsC,EAAE,WAAsD,EAAE,EAAE;QAClH,IAAI,qBAAqB,IAAI,IAAA,oDAAoB,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC5D,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAChE,OAAO,IAAK,IAAI,CAAC,KAAK,CAAC,aAAa,CAAiB,CAAC,IAAI,MAAM,aAAa,EAAE,CAAC;IAClF,CAAC,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAbW,QAAA,kCAAkC,sCAa7C"}
package/src/core/design-token/renderers/metadata/design-token-value.renderers.d.ts CHANGED
@@ -9,6 +9,8 @@ export interface MetadataTokenValueRendererOptions {
9
9
  * Renderer the name of the CSS Variable (without initial --)
10
10
  */
11
11
  tokenVariableNameRenderer?: TokenKeyRenderer;
12
+ /** Determine if the private variable should be ignored */
13
+ ignorePrivateVariable?: boolean;
12
14
  }
13
15
  /**
14
16
  * Retrieve the Design Token value renderer
package/src/core/design-token/renderers/metadata/design-token-value.renderers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"design-token-value.renderers.d.ts","sourceRoot":"","sources":["../../../../../../src/core/design-token/renderers/metadata/design-token-value.renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgC,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAItI,wDAAwD;AACxD,MAAM,WAAW,iCAAiC;IAChD;;OAEG;IACH,gBAAgB,CAAC,EAAE,kBAAkB,CAAC;IAEtC;;OAEG;IACH,yBAAyB,CAAC,EAAE,gBAAgB,CAAC;CAC9C;AAED;;;GAGG;AACH,eAAO,MAAM,6BAA6B,aAAc,iCAAiC,KAAG,kBAkB3F,CAAC"}
1
+ {"version":3,"file":"design-token-value.renderers.d.ts","sourceRoot":"","sources":["../../../../../../src/core/design-token/renderers/metadata/design-token-value.renderers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgC,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAKtI,wDAAwD;AACxD,MAAM,WAAW,iCAAiC;IAChD;;OAEG;IACH,gBAAgB,CAAC,EAAE,kBAAkB,CAAC;IAEtC;;OAEG;IACH,yBAAyB,CAAC,EAAE,gBAAgB,CAAC;IAE7C,0DAA0D;IAC1D,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAgBD;;;GAGG;AACH,eAAO,MAAM,6BAA6B,aAAc,iCAAiC,KAAG,kBAwB3F,CAAC"}
package/src/core/design-token/renderers/metadata/design-token-value.renderers.js CHANGED
@@ -2,6 +2,20 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getMetadataTokenValueRenderer = void 0;
4
4
  const css_1 = require("../css");
5
+ const design_token_renderer_helpers_1 = require("../design-token.renderer.helpers");
6
+ /**
7
+ * Resolve the references and flatten them to keep only public references
8
+ * @param refs List of references to resolves
9
+ * @param variableSet Complete list of the parsed Design Token
10
+ */
11
+ const resolvePrivateReferences = (refs, variableSet) => {
12
+ return [
13
+ ...refs.filter((node) => !(0, design_token_renderer_helpers_1.isO3rPrivateVariable)(node)),
14
+ ...refs
15
+ .filter(design_token_renderer_helpers_1.isO3rPrivateVariable)
16
+ .flatMap((node) => resolvePrivateReferences(node.getReferencesNode(variableSet), variableSet))
17
+ ];
18
+ };
5
19
  /**
6
20
  * Retrieve the Design Token value renderer
7
21
  * @param options
@@ -11,14 +25,19 @@ const getMetadataTokenValueRenderer = (options) => {
11
25
  const cssValueRenderer = options?.cssValueRenderer || (0, css_1.getCssTokenValueRenderer)({ tokenVariableNameRenderer });
12
26
  const renderer = (variable, variableSet) => {
13
27
  const cssType = variable.getType(variableSet);
28
+ const references = variable.getReferencesNode(variableSet);
14
29
  const variableValue = {
15
30
  name: variable.getKey(tokenVariableNameRenderer),
16
31
  defaultValue: cssValueRenderer(variable, variableSet),
17
32
  description: variable.description,
18
- references: variable.getReferencesNode(variableSet).map((node) => JSON.parse(renderer(node, variableSet))),
33
+ references: (!options?.ignorePrivateVariable ? references : resolvePrivateReferences(references, variableSet))
34
+ .map((node) => JSON.parse(renderer(node, variableSet))),
19
35
  type: cssType !== 'color' ? 'string' : 'color',
20
36
  ...variable.extensions.o3rMetadata
21
37
  };
38
+ if (variableValue.references?.length === 0) {
39
+ delete variableValue.references;
40
+ }
22
41
  return JSON.stringify(variableValue);
23
42
  };
24
43
  return renderer;
package/src/core/design-token/renderers/metadata/design-token-value.renderers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"design-token-value.renderers.js","sourceRoot":"","sources":["../../../../../../src/core/design-token/renderers/metadata/design-token-value.renderers.ts"],"names":[],"mappings":";;;AAEA,gCAAkD;AAelD;;;GAGG;AACI,MAAM,6BAA6B,GAAG,CAAC,OAA2C,EAAsB,EAAE;IAC/G,MAAM,yBAAyB,GAAG,OAAO,EAAE,yBAAyB,CAAC;IACrE,MAAM,gBAAgB,GAAG,OAAO,EAAE,gBAAgB,IAAI,IAAA,8BAAwB,EAAC,EAAC,yBAAyB,EAAC,CAAC,CAAC;IAE5G,MAAM,QAAQ,GAAG,CAAC,QAAsC,EAAE,WAAsD,EAAE,EAAE;QAClH,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,aAAa,GAAgB;YACjC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC;YAChD,YAAY,EAAE,gBAAgB,CAAC,QAAQ,EAAE,WAAW,CAAC;YACrD,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,UAAU,EAAE,QAAQ,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;YAC1G,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO;YAC9C,GAAG,QAAQ,CAAC,UAAU,CAAC,WAAW;SACnC,CAAC;QAEF,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAlBW,QAAA,6BAA6B,iCAkBxC"}
1
+ {"version":3,"file":"design-token-value.renderers.js","sourceRoot":"","sources":["../../../../../../src/core/design-token/renderers/metadata/design-token-value.renderers.ts"],"names":[],"mappings":";;;AAEA,gCAAkD;AAClD,oFAAwE;AAkBxE;;;;GAIG;AACH,MAAM,wBAAwB,GAAG,CAAC,IAAoC,EAAE,WAAsD,EAAkC,EAAE;IAChK,OAAO;QACL,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAA,oDAAoB,EAAC,IAAI,CAAC,CAAC;QACrD,GAAG,IAAI;aACJ,MAAM,CAAC,oDAAoB,CAAC;aAC5B,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;KACjG,CAAC;AACJ,CAAC,CAAC;AAEF;;;GAGG;AACI,MAAM,6BAA6B,GAAG,CAAC,OAA2C,EAAsB,EAAE;IAC/G,MAAM,yBAAyB,GAAG,OAAO,EAAE,yBAAyB,CAAC;IACrE,MAAM,gBAAgB,GAAG,OAAO,EAAE,gBAAgB,IAAI,IAAA,8BAAwB,EAAC,EAAC,yBAAyB,EAAC,CAAC,CAAC;IAE5G,MAAM,QAAQ,GAAG,CAAC,QAAsC,EAAE,WAAsD,EAAE,EAAE;QAClH,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,QAAQ,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAgB;YACjC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC;YAChD,YAAY,EAAE,gBAAgB,CAAC,QAAQ,EAAE,WAAW,CAAC;YACrD,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;iBAC3G,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;YACzD,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO;YAC9C,GAAG,QAAQ,CAAC,UAAU,CAAC,WAAW;SACnC,CAAC;QAEF,IAAI,aAAa,CAAC,UAAU,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,aAAa,CAAC,UAAU,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAxBW,QAAA,6BAA6B,iCAwBxC"}