@tamagui/web 1.28.0 → 1.28.1

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 (7) hide show
  1. package/dist/cjs/createVariables.js +5 -6
  2. package/dist/cjs/createVariables.js.map +1 -1
  3. package/dist/esm/createVariables.js +5 -6
  4. package/dist/esm/createVariables.js.map +1 -1
  5. package/package.json +9 -9
  6. package/src/createVariables.ts +5 -8
  7. package/types/createVariables.d.ts.map +1 -1
package/dist/cjs/createVariables.js CHANGED
@@ -26,12 +26,11 @@ var import_createVariable = require("./createVariable");
26
26
  const createVariables = (tokens, parentPath = "", isFont = false) => {
27
27
  const res = {};
28
28
  let i = 0;
29
- for (let key in tokens) {
29
+ for (let keyIn in tokens) {
30
30
  i++;
31
- const val = tokens[key];
32
- if (key[0] === "$") {
33
- key = key.slice(1);
34
- }
31
+ const val = tokens[keyIn];
32
+ const keyWithPrefix = keyIn[0] === "$" ? keyIn : `$${keyIn}`;
33
+ const key = keyWithPrefix.slice(1);
35
34
  if ((0, import_createVariable.isVariable)(val)) {
36
35
  res[key] = val;
37
36
  continue;
@@ -43,7 +42,7 @@ const createVariables = (tokens, parentPath = "", isFont = false) => {
43
42
  res[key] = createVariables(tokens[key], name);
44
43
  continue;
45
44
  }
46
- res[key] = (0, import_createVariable.isVariable)(val) ? val : (0, import_createVariable.createVariable)({ val, name, key: niceKey });
45
+ res[key] = (0, import_createVariable.isVariable)(val) ? val : (0, import_createVariable.createVariable)({ val, name, key: keyWithPrefix });
47
46
  }
48
47
  return res;
49
48
  };
package/dist/cjs/createVariables.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createVariables.ts"],
4
- "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA2B;AAE3B,4BAAqD;AAc9C,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,OAAO,QAAQ;AACtB;AACA,UAAM,MAAM,OAAO,GAAG;AAEtB,QAAI,IAAI,CAAC,MAAM,KAAK;AAElB,YAAM,IAAI,MAAM,CAAC;AAAA,IACnB;AACA,YAAI,kCAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,cAAU,2BAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,cAAc,SAAS;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,GAAG,IAAI,gBAAgB,OAAO,GAAG,GAAU,IAAI;AACnD;AAAA,IACF;AACA,QAAI,GAAG,QAAI,kCAAW,GAAG,IAAI,UAAM,sCAAe,EAAE,KAAK,MAAM,KAAK,QAAQ,CAAC;AAAA,EAC/E;AAEA,SAAO;AACT;",
4
+ "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA2B;AAE3B,4BAAqD;AAc9C,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK;AACxB,UAAM,gBAAgB,MAAM,CAAC,MAAM,MAAM,QAAQ,IAAI;AACrD,UAAM,MAAM,cAAc,MAAM,CAAC;AACjC,YAAI,kCAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,cAAU,2BAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,cAAc,SAAS;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,GAAG,IAAI,gBAAgB,OAAO,GAAG,GAAU,IAAI;AACnD;AAAA,IACF;AACA,QAAI,GAAG,QAAI,kCAAW,GAAG,IAAI,UAAM,sCAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AAAA,EACrF;AAEA,SAAO;AACT;",
5
5
  "names": []
6
6
  }
package/dist/esm/createVariables.js CHANGED
@@ -3,12 +3,11 @@ import { createVariable, isVariable } from "./createVariable";
3
3
  const createVariables = (tokens, parentPath = "", isFont = false) => {
4
4
  const res = {};
5
5
  let i = 0;
6
- for (let key in tokens) {
6
+ for (let keyIn in tokens) {
7
7
  i++;
8
- const val = tokens[key];
9
- if (key[0] === "$") {
10
- key = key.slice(1);
11
- }
8
+ const val = tokens[keyIn];
9
+ const keyWithPrefix = keyIn[0] === "$" ? keyIn : `$${keyIn}`;
10
+ const key = keyWithPrefix.slice(1);
12
11
  if (isVariable(val)) {
13
12
  res[key] = val;
14
13
  continue;
@@ -20,7 +19,7 @@ const createVariables = (tokens, parentPath = "", isFont = false) => {
20
19
  res[key] = createVariables(tokens[key], name);
21
20
  continue;
22
21
  }
23
- res[key] = isVariable(val) ? val : createVariable({ val, name, key: niceKey });
22
+ res[key] = isVariable(val) ? val : createVariable({ val, name, key: keyWithPrefix });
24
23
  }
25
24
  return res;
26
25
  };
package/dist/esm/createVariables.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createVariables.ts"],
4
- "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAmB,gBAAgB,kBAAkB;AAc9C,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,OAAO,QAAQ;AACtB;AACA,UAAM,MAAM,OAAO,GAAG;AAEtB,QAAI,IAAI,CAAC,MAAM,KAAK;AAElB,YAAM,IAAI,MAAM,CAAC;AAAA,IACnB;AACA,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,UAAU,WAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,cAAc,SAAS;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,GAAG,IAAI,gBAAgB,OAAO,GAAG,GAAU,IAAI;AACnD;AAAA,IACF;AACA,QAAI,GAAG,IAAI,WAAW,GAAG,IAAI,MAAM,eAAe,EAAE,KAAK,MAAM,KAAK,QAAQ,CAAC;AAAA,EAC/E;AAEA,SAAO;AACT;",
4
+ "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAmB,gBAAgB,kBAAkB;AAc9C,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK;AACxB,UAAM,gBAAgB,MAAM,CAAC,MAAM,MAAM,QAAQ,IAAI;AACrD,UAAM,MAAM,cAAc,MAAM,CAAC;AACjC,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,UAAU,WAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,cAAc,SAAS;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,GAAG,IAAI,gBAAgB,OAAO,GAAG,GAAU,IAAI;AACnD;AAAA,IACF;AACA,QAAI,GAAG,IAAI,WAAW,GAAG,IAAI,MAAM,eAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AAAA,EACrF;AAEA,SAAO;AACT;",
5
5
  "names": []
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/web",
3
- "version": "1.28.0",
3
+ "version": "1.28.1",
4
4
  "source": "src/index.ts",
5
5
  "main": "dist/cjs",
6
6
  "module": "dist/esm",
@@ -27,19 +27,19 @@
27
27
  "reset.css"
28
28
  ],
29
29
  "dependencies": {
30
- "@tamagui/compose-refs": "1.28.0",
31
- "@tamagui/constants": "1.28.0",
32
- "@tamagui/helpers": "1.28.0",
33
- "@tamagui/normalize-css-color": "1.28.0",
34
- "@tamagui/use-did-finish-ssr": "1.28.0",
35
- "@tamagui/use-event": "1.28.0",
36
- "@tamagui/use-force-update": "1.28.0"
30
+ "@tamagui/compose-refs": "1.28.1",
31
+ "@tamagui/constants": "1.28.1",
32
+ "@tamagui/helpers": "1.28.1",
33
+ "@tamagui/normalize-css-color": "1.28.1",
34
+ "@tamagui/use-did-finish-ssr": "1.28.1",
35
+ "@tamagui/use-event": "1.28.1",
36
+ "@tamagui/use-force-update": "1.28.1"
37
37
  },
38
38
  "peerDependencies": {
39
39
  "react": "*"
40
40
  },
41
41
  "devDependencies": {
42
- "@tamagui/build": "1.28.0",
42
+ "@tamagui/build": "1.28.1",
43
43
  "@testing-library/react": "^13.4.0",
44
44
  "csstype": "^3.0.10",
45
45
  "react": "^18.2.0",
package/src/createVariables.ts CHANGED
@@ -21,14 +21,11 @@ export const createVariables = <A extends DeepTokenObject>(
21
21
  ): DeepVariableObject<A> => {
22
22
  const res: any = {}
23
23
  let i = 0
24
- for (let key in tokens) {
24
+ for (let keyIn in tokens) {
25
25
  i++
26
- const val = tokens[key]
27
- // always remove $ prefix
28
- if (key[0] === '$') {
29
- // @ts-ignore
30
- key = key.slice(1)
31
- }
26
+ const val = tokens[keyIn]
27
+ const keyWithPrefix = keyIn[0] === '$' ? keyIn : `$${keyIn}`
28
+ const key = keyWithPrefix.slice(1)
32
29
  if (isVariable(val)) {
33
30
  res[key] = val
34
31
  continue
@@ -41,7 +38,7 @@ export const createVariables = <A extends DeepTokenObject>(
41
38
  res[key] = createVariables(tokens[key] as any, name)
42
39
  continue
43
40
  }
44
- res[key] = isVariable(val) ? val : createVariable({ val, name, key: niceKey })
41
+ res[key] = isVariable(val) ? val : createVariable({ val, name, key: keyWithPrefix })
45
42
  }
46
43
 
47
44
  return res
package/types/createVariables.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createVariables.d.ts","sourceRoot":"","sources":["../src/createVariables.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAA8B,MAAM,kBAAkB,CAAA;AAEvE,KAAK,eAAe,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,IAAI;IACxD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,eAAe,IAAI;KACzD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAC5C,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAChB,CAAC,CAAC,GAAG,CAAC,SAAS,eAAe,GAC9B,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAC1B,KAAK;CACV,CAAA;AAED,eAAO,MAAM,eAAe,6GA+B3B,CAAA"}
1
+ {"version":3,"file":"createVariables.d.ts","sourceRoot":"","sources":["../src/createVariables.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAA8B,MAAM,kBAAkB,CAAA;AAEvE,KAAK,eAAe,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,IAAI;IACxD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,eAAe,IAAI;KACzD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAC5C,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAChB,CAAC,CAAC,GAAG,CAAC,SAAS,eAAe,GAC9B,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAC1B,KAAK;CACV,CAAA;AAED,eAAO,MAAM,eAAe,6GA4B3B,CAAA"}