@alloy-js/core 0.20.0-dev.7 → 0.20.0-dev.9

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 (36) hide show
  1. package/dist/src/components/Output.d.ts.map +1 -1
  2. package/dist/src/components/Output.js +16 -12
  3. package/dist/src/components/Output.js.map +1 -1
  4. package/dist/src/components/SourceFile.d.ts.map +1 -1
  5. package/dist/src/components/SourceFile.js +5 -3
  6. package/dist/src/components/SourceFile.js.map +1 -1
  7. package/dist/src/context/format-options.d.ts +10 -0
  8. package/dist/src/context/format-options.d.ts.map +1 -0
  9. package/dist/src/context/format-options.js +32 -0
  10. package/dist/src/context/format-options.js.map +1 -0
  11. package/dist/src/context/index.d.ts +1 -0
  12. package/dist/src/context/index.d.ts.map +1 -1
  13. package/dist/src/context/index.js +1 -0
  14. package/dist/src/context/index.js.map +1 -1
  15. package/dist/src/render.d.ts +5 -0
  16. package/dist/src/render.d.ts.map +1 -1
  17. package/dist/src/render.js +6 -7
  18. package/dist/src/render.js.map +1 -1
  19. package/dist/test/components/source-file.test.d.ts.map +1 -1
  20. package/dist/test/components/source-file.test.js +123 -9
  21. package/dist/test/components/source-file.test.js.map +1 -1
  22. package/dist/test/rendering/formatting.test.js +2 -0
  23. package/dist/test/rendering/formatting.test.js.map +1 -1
  24. package/dist/testing/extend-expect.js +12 -7
  25. package/dist/testing/extend-expect.js.map +1 -1
  26. package/dist/tsconfig.tsbuildinfo +1 -1
  27. package/package.json +1 -1
  28. package/src/components/Output.tsx +14 -14
  29. package/src/components/SourceFile.tsx +4 -2
  30. package/src/context/format-options.ts +31 -0
  31. package/src/context/index.ts +1 -0
  32. package/src/render.ts +21 -20
  33. package/temp/api.json +269 -0
  34. package/test/components/source-file.test.tsx +110 -12
  35. package/test/rendering/formatting.test.tsx +2 -0
  36. package/testing/extend-expect.ts +17 -19
@@ -17,6 +17,9 @@ expect.extend({
17
17
  return validateRender(actual, expectedRaw, this.isNot);
18
18
  }
19
19
  });
20
+ function isAsymmetricMatcher(value) {
21
+ return value.$$typeof === Symbol.for("jest.asymmetricMatcher");
22
+ }
20
23
  function validateRender(actual, expectedRaw, isNot) {
21
24
  const message = () => `Render is${isNot ? " not" : ""} incorrect`;
22
25
  if (typeof expectedRaw === "string") {
@@ -45,10 +48,14 @@ function validateRender(actual, expectedRaw, isNot) {
45
48
  const expected = expectedRaw;
46
49
  const dedentExpected = {};
47
50
  for (const [key, value] of Object.entries(expected)) {
48
- dedentExpected[key] = dedent(value);
51
+ if (isAsymmetricMatcher(value)) {
52
+ dedentExpected[key] = value;
53
+ } else {
54
+ dedentExpected[key] = dedent(value);
55
+ }
49
56
  }
50
57
  const pass = Object.keys(actual).length === Object.keys(expected).length && Object.entries(actual).every(([key, value]) => {
51
- return dedentExpected[key] === value;
58
+ return isAsymmetricMatcher(dedentExpected[key]) ? dedentExpected[key].asymmetricMatch(value) : dedentExpected[key] === value;
52
59
  });
53
60
  return {
54
61
  pass,
@@ -67,8 +74,6 @@ function validateRender(actual, expectedRaw, isNot) {
67
74
  }
68
75
  function getFilesFromTree(tree, options) {
69
76
  const files = {};
70
- // when passing Output, the first render tree child is the Output component.
71
- const rootRenderOptions = Array.isArray(tree) ? getContextForRenderNode(tree[0])?.meta?.printOptions ?? {} : {};
72
77
  collectSourceFiles(tree);
73
78
  // If we found no source files, we return the tree as a string.
74
79
  if (Object.keys(files).length === 0) {
@@ -83,9 +88,9 @@ function getFilesFromTree(tree, options) {
83
88
  const context = getContextForRenderNode(root);
84
89
  if (context?.meta?.sourceFile) {
85
90
  files[context.meta.sourceFile.path] = printTree(root, {
86
- printWidth: options?.printWidth ?? context.meta?.printOptions?.printWidth ?? rootRenderOptions.printWidth,
87
- tabWidth: options?.tabWidth ?? context.meta?.printOptions?.tabWidth ?? rootRenderOptions.tabWidth,
88
- useTabs: options?.useTabs ?? context.meta?.printOptions?.useTabs ?? rootRenderOptions.useTabs
91
+ printWidth: options?.printWidth ?? context.meta?.printOptions?.printWidth,
92
+ tabWidth: options?.tabWidth ?? context.meta?.printOptions?.tabWidth,
93
+ useTabs: options?.useTabs ?? context.meta?.printOptions?.useTabs
89
94
  });
90
95
  } else {
91
96
  visitChildren();
@@ -1 +1 @@
1
- {"version":3,"names":["getContextForRenderNode","printTree","renderTree","expect","flushJobs","flushJobsAsync","dedent","extend","toRenderTo","received","expectedRaw","renderOptions","tree","actual","getFilesFromTree","validateRender","isNot","toRenderToAsync","message","expected","actualStr","Object","keys","length","values","pass","dedentExpected","key","value","entries","every","options","files","rootRenderOptions","Array","isArray","meta","printOptions","collectSourceFiles","root","context","sourceFile","path","printWidth","tabWidth","useTabs","visitChildren","child"],"sources":["../../testing/extend-expect.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getContextForRenderNode","printTree","renderTree","expect","flushJobs","flushJobsAsync","dedent","extend","toRenderTo","received","expectedRaw","renderOptions","tree","actual","getFilesFromTree","validateRender","isNot","toRenderToAsync","isAsymmetricMatcher","value","$$typeof","Symbol","for","message","expected","actualStr","Object","keys","length","values","pass","dedentExpected","key","entries","every","asymmetricMatch","options","files","collectSourceFiles","root","Array","isArray","context","meta","sourceFile","path","printWidth","printOptions","tabWidth","useTabs","visitChildren","child"],"sources":["../../testing/extend-expect.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}