@atlaspack/transformer-tokens 1.0.12-dev-swc44-b0b390313.0 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaspack/transformer-tokens
 
+## 1.1.0
+
+### Minor Changes
+
+- [#942](https://github.com/atlassian-labs/atlaspack/pull/942) [`695339e`](https://github.com/atlassian-labs/atlaspack/commit/695339e4fd46df9590013c2ef4de74cb22225927) Thanks [@marcins](https://github.com/marcins)! - Improve error handling in Tokens transform
+
+### Patch Changes
+
+- Updated dependencies [[`7cb8569`](https://github.com/atlassian-labs/atlaspack/commit/7cb85698143e381fcb887173b2bfd15f0aea7918), [`695339e`](https://github.com/atlassian-labs/atlaspack/commit/695339e4fd46df9590013c2ef4de74cb22225927)]:
+  - @atlaspack/rust@3.17.0
+  - @atlaspack/source-map@3.2.2
+  - @atlaspack/utils@3.2.8
+  - @atlaspack/types-internal@2.22.4
+  - @atlaspack/plugin@2.14.47
+
 ## 1.0.11
 
 ### Patch Changes

package/dist/TokensTransformer.js

@@ -1,9 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const diagnostic_1 = require("@atlaspack/diagnostic");
+const diagnostic_1 = __importStar(require("@atlaspack/diagnostic"));
 const feature_flags_1 = require("@atlaspack/feature-flags");
 const plugin_1 = require("@atlaspack/plugin");
 const rust_1 = require("@atlaspack/rust");
@@ -48,7 +81,7 @@ exports.default = new plugin_1.Transformer({
             return resolvedConfig;
         }
     },
-    async transform({ asset, options, config }) {
+    async transform({ asset, options, config, logger }) {
         if (!(0, feature_flags_1.getFeatureFlag)('enableTokensTransformer')) {
             return [asset];
         }
@@ -72,7 +105,53 @@ exports.default = new plugin_1.Transformer({
             tokensOptions: {
                 ...config,
             },
+        }).catch((error) => {
+            // Re-throw with context about which file failed
+            throw new Error(`Failed to transform tokens in ${asset.filePath}: ${error.message || error}`);
         });
+        // Check for diagnostics and convert them to proper Diagnostic objects with code frames
+        if (result.diagnostics && result.diagnostics.length > 0) {
+            const convertDiagnostic = (diagnostic) => {
+                const codeHighlights = diagnostic.code_highlights?.map((highlight) => (0, diagnostic_1.convertSourceLocationToHighlight)({
+                    start: {
+                        line: highlight.loc.start_line,
+                        column: highlight.loc.start_col,
+                    },
+                    end: {
+                        line: highlight.loc.end_line,
+                        column: highlight.loc.end_col,
+                    },
+                }, highlight.message ?? undefined));
+                const res = {
+                    message: diagnostic.message,
+                    codeFrames: [
+                        {
+                            filePath: asset.filePath,
+                            code: code,
+                            codeHighlights: codeHighlights ?? [],
+                        },
+                    ],
+                    hints: diagnostic.hints,
+                };
+                if (diagnostic.documentation_url) {
+                    res.documentationURL = diagnostic.documentation_url;
+                }
+                return res;
+            };
+            const errors = result.diagnostics.filter((d) => d.severity === 'Error' ||
+                (d.severity === 'SourceError' && asset.isSource));
+            if (errors.length > 0) {
+                throw new diagnostic_1.default({
+                    diagnostic: errors.map(convertDiagnostic),
+                });
+            }
+            // Log warnings
+            const warnings = result.diagnostics.filter((d) => d.severity === 'Warning' ||
+                (d.severity === 'SourceError' && !asset.isSource));
+            if (warnings.length > 0) {
+                logger.warn(warnings.map(convertDiagnostic));
+            }
+        }
         // Ensure this transform is invalidated when the token data changes
         asset.invalidateOnFileChange(config.tokenDataPath);
         // Handle sourcemap merging if sourcemap is generated

package/lib/TokensTransformer.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 function _diagnostic() {
-  const data = require("@atlaspack/diagnostic");
+  const data = _interopRequireWildcard(require("@atlaspack/diagnostic"));
   _diagnostic = function () {
     return data;
   };
@@ -54,6 +54,8 @@ function _path() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const CONFIG_SCHEMA = {
   type: 'object',
   properties: {
@@ -110,7 +112,8 @@ var _default = exports.default = new (_plugin().Transformer)({
   async transform({
     asset,
     options,
-    config
+    config,
+    logger
   }) {
     if (!(0, _featureFlags().getFeatureFlag)('enableTokensTransformer')) {
       return [asset];
@@ -132,8 +135,53 @@ var _default = exports.default = new (_plugin().Transformer)({
       tokensOptions: {
         ...config
       }
+    }).catch(error => {
+      // Re-throw with context about which file failed
+      throw new Error(`Failed to transform tokens in ${asset.filePath}: ${error.message || error}`);
     });
 
+    // Check for diagnostics and convert them to proper Diagnostic objects with code frames
+    if (result.diagnostics && result.diagnostics.length > 0) {
+      const convertDiagnostic = diagnostic => {
+        var _diagnostic$code_high;
+        const codeHighlights = (_diagnostic$code_high = diagnostic.code_highlights) === null || _diagnostic$code_high === void 0 ? void 0 : _diagnostic$code_high.map(highlight => (0, _diagnostic().convertSourceLocationToHighlight)({
+          start: {
+            line: highlight.loc.start_line,
+            column: highlight.loc.start_col
+          },
+          end: {
+            line: highlight.loc.end_line,
+            column: highlight.loc.end_col
+          }
+        }, highlight.message ?? undefined));
+        const res = {
+          message: diagnostic.message,
+          codeFrames: [{
+            filePath: asset.filePath,
+            code: code,
+            codeHighlights: codeHighlights ?? []
+          }],
+          hints: diagnostic.hints
+        };
+        if (diagnostic.documentation_url) {
+          res.documentationURL = diagnostic.documentation_url;
+        }
+        return res;
+      };
+      const errors = result.diagnostics.filter(d => d.severity === 'Error' || d.severity === 'SourceError' && asset.isSource);
+      if (errors.length > 0) {
+        throw new (_diagnostic().default)({
+          diagnostic: errors.map(convertDiagnostic)
+        });
+      }
+
+      // Log warnings
+      const warnings = result.diagnostics.filter(d => d.severity === 'Warning' || d.severity === 'SourceError' && !asset.isSource);
+      if (warnings.length > 0) {
+        logger.warn(warnings.map(convertDiagnostic));
+      }
+    }
+
     // Ensure this transform is invalidated when the token data changes
     asset.invalidateOnFileChange(config.tokenDataPath);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-tokens",
-  "version": "1.0.12-dev-swc44-b0b390313.0",
+  "version": "1.1.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,17 +16,16 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.5-dev-swc44-b0b390313.0",
-    "@atlaspack/feature-flags": "2.27.6-dev-swc44-b0b390313.0",
-    "@atlaspack/plugin": "2.14.47-dev-swc44-b0b390313.0",
-    "@atlaspack/rust": "3.16.1-dev-swc44-b0b390313.0",
-    "@atlaspack/source-map": "3.2.2-dev-swc44-b0b390313.0",
-    "@atlaspack/types-internal": "2.22.4-dev-swc44-b0b390313.0",
-    "@atlaspack/utils": "3.2.8-dev-swc44-b0b390313.0"
+    "@atlaspack/diagnostic": "2.14.4",
+    "@atlaspack/feature-flags": "2.27.5",
+    "@atlaspack/types-internal": "2.22.4",
+    "@atlaspack/plugin": "2.14.47",
+    "@atlaspack/rust": "3.17.0",
+    "@atlaspack/utils": "3.2.8",
+    "@atlaspack/source-map": "3.2.2"
   },
   "type": "commonjs",
   "scripts": {
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
-  },
-  "gitHead": "b0b3903133091347563cb8ea34f328655c4ba0fb"
+  }
 }

package/src/TokensTransformer.ts

@@ -1,4 +1,9 @@
-import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
+import {
+  encodeJSONKeyComponent,
+  default as ThrowableDiagnostic,
+  convertSourceLocationToHighlight,
+  type Diagnostic,
+} from '@atlaspack/diagnostic';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {Transformer} from '@atlaspack/plugin';
 import {applyTokensPlugin, TokensPluginResult} from '@atlaspack/rust';
@@ -72,7 +77,7 @@ export default new Transformer({
     }
   },
 
-  async transform({asset, options, config}) {
+  async transform({asset, options, config, logger}) {
     if (!getFeatureFlag('enableTokensTransformer')) {
       return [asset];
     }
@@ -92,15 +97,84 @@ export default new Transformer({
       return [asset];
     }
 
-    const result = await (applyTokensPlugin(codeBuffer, {
-      filename: asset.filePath,
-      projectRoot: options.projectRoot,
-      isSource: asset.isSource,
-      sourceMaps: !!asset.env.sourceMap,
-      tokensOptions: {
-        ...config,
-      },
-    }) as Promise<TokensPluginResult>);
+    const result = await (
+      applyTokensPlugin(codeBuffer, {
+        filename: asset.filePath,
+        projectRoot: options.projectRoot,
+        isSource: asset.isSource,
+        sourceMaps: !!asset.env.sourceMap,
+        tokensOptions: {
+          ...config,
+        },
+      }) as Promise<TokensPluginResult>
+    ).catch((error) => {
+      // Re-throw with context about which file failed
+      throw new Error(
+        `Failed to transform tokens in ${asset.filePath}: ${error.message || error}`,
+      );
+    });
+
+    // Check for diagnostics and convert them to proper Diagnostic objects with code frames
+    if (result.diagnostics && result.diagnostics.length > 0) {
+      const convertDiagnostic = (diagnostic: any): Diagnostic => {
+        const codeHighlights = diagnostic.code_highlights?.map(
+          (highlight: any) =>
+            convertSourceLocationToHighlight(
+              {
+                start: {
+                  line: highlight.loc.start_line,
+                  column: highlight.loc.start_col,
+                },
+                end: {
+                  line: highlight.loc.end_line,
+                  column: highlight.loc.end_col,
+                },
+              },
+              highlight.message ?? undefined,
+            ),
+        );
+
+        const res: Diagnostic = {
+          message: diagnostic.message,
+          codeFrames: [
+            {
+              filePath: asset.filePath,
+              code: code,
+              codeHighlights: codeHighlights ?? [],
+            },
+          ],
+          hints: diagnostic.hints,
+        };
+
+        if (diagnostic.documentation_url) {
+          res.documentationURL = diagnostic.documentation_url;
+        }
+
+        return res;
+      };
+
+      const errors = result.diagnostics.filter(
+        (d: any) =>
+          d.severity === 'Error' ||
+          (d.severity === 'SourceError' && asset.isSource),
+      );
+
+      if (errors.length > 0) {
+        throw new ThrowableDiagnostic({
+          diagnostic: errors.map(convertDiagnostic),
+        });
+      }
+
+      // Log warnings
+      const warnings = result.diagnostics.filter(
+        (d: any) =>
+          d.severity === 'Warning' ||
+          (d.severity === 'SourceError' && !asset.isSource),
+      );
+      if (warnings.length > 0) {
+        logger.warn(warnings.map(convertDiagnostic));
+      }
+    }
 
     // Ensure this transform is invalidated when the token data changes
     asset.invalidateOnFileChange(config.tokenDataPath);