@atlaspack/transformer-svg 2.14.5-canary.39 → 2.14.5-canary.391

package/dist/inline.js

@@ -0,0 +1,124 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = extractInlineAssets;
+const rust_1 = require("@atlaspack/rust");
+const posthtml_1 = __importDefault(require("posthtml"));
+const SCRIPT_TYPES = {
+    'application/ecmascript': 'js',
+    'application/javascript': 'js',
+    'text/javascript': 'js',
+    module: 'js',
+};
+function extractInlineAssets(asset, ast) {
+    const program = ast.program;
+    let key = 0;
+    // Extract <style> elements for processing.
+    const parts = [];
+    // @ts-expect-error TS2339
+    (0, posthtml_1.default)().walk.call(program, (node) => {
+        if (node.tag === 'style' || node.tag === 'script') {
+            const value = node.content && node.content.join('');
+            if (!value) {
+                return node;
+            }
+            let type, env;
+            if (node.tag === 'style') {
+                if (node.attrs && node.attrs.type != null) {
+                    type = node.attrs.type.split('/')[1];
+                }
+                else {
+                    type = 'css';
+                }
+            }
+            else if (node.tag === 'script') {
+                // @ts-expect-error TS7053
+                if (node.attrs && SCRIPT_TYPES[node.attrs.type]) {
+                    // @ts-expect-error TS7053
+                    type = SCRIPT_TYPES[node.attrs.type];
+                }
+                else if (node.attrs) {
+                    type = node.attrs.type.split('/')[1];
+                }
+                else {
+                    type = 'js';
+                }
+                env = {
+                    sourceType: node.attrs && node.attrs.type === 'module' ? 'module' : 'script',
+                    // SVG script elements do not support type="module" natively yet.
+                    outputFormat: 'global',
+                    loc: node.location
+                        ? {
+                            filePath: asset.filePath,
+                            start: node.location.start,
+                            end: node.location.end,
+                        }
+                        : undefined,
+                };
+            }
+            if (!type) {
+                return node;
+            }
+            let attrs = node.attrs;
+            if (!attrs) {
+                attrs = {};
+                node.attrs = attrs;
+            }
+            // Inform packager to remove type, since CSS and JS are the defaults.
+            delete attrs.type;
+            let parcelKey;
+            // allow a script/style tag to declare its key
+            if (attrs['data-parcel-key']) {
+                parcelKey = attrs['data-parcel-key'];
+            }
+            else {
+                parcelKey = (0, rust_1.hashString)(`${asset.id}:${key++}`);
+            }
+            // insert parcelId to allow us to retrieve node during packaging
+            attrs['data-parcel-key'] = parcelKey;
+            asset.setAST(ast); // mark dirty
+            asset.addDependency({
+                specifier: parcelKey,
+                specifierType: 'esm',
+            });
+            parts.push({
+                type,
+                content: value,
+                uniqueKey: parcelKey,
+                bundleBehavior: 'inline',
+                // @ts-expect-error TS2322
+                env,
+                meta: {
+                    type: 'tag',
+                    node,
+                    startLine: node.location?.start.line,
+                },
+            });
+        }
+        // Process inline style attributes.
+        let attrs = node.attrs;
+        let style = attrs?.style;
+        if (attrs != null && style != null) {
+            let parcelKey = (0, rust_1.hashString)(`${asset.id}:${key++}`);
+            attrs.style = asset.addDependency({
+                specifier: parcelKey,
+                specifierType: 'esm',
+            });
+            asset.setAST(ast); // mark dirty
+            parts.push({
+                type: 'css',
+                content: style,
+                uniqueKey: parcelKey,
+                bundleBehavior: 'inline',
+                meta: {
+                    type: 'attr',
+                    node,
+                },
+            });
+        }
+        return node;
+    });
+    return parts;
+}

package/lib/SVGTransformer.js

@@ -81,6 +81,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       (0, _dependencies.default)(asset, ast);
     } catch (errors) {
       throw new (_diagnostic().default)({
+        // @ts-expect-error TS7006
         diagnostic: errors.map(error => ({
           message: error.message,
           origin: '@atlaspack/transformer-svg',

package/lib/dependencies.js

@@ -54,7 +54,9 @@ const OPTIONS = {
 };
 function collectDependencies(asset, ast) {
   let isDirty = false;
+  // @ts-expect-error TS7034
   const errors = [];
+  // @ts-expect-error TS2339
   (0, _posthtml().default)().walk.call(ast.program, node => {
     // Ideally we'd have location information for specific attributes...
     let getLoc = () => node.location ? {
@@ -82,6 +84,8 @@ function collectDependencies(asset, ast) {
       if (attrs[attr][0] === '#') {
         continue;
       }
+
+      // @ts-expect-error TS7053
       const elements = ATTRS[attr];
       if (elements && elements.includes(node.tag)) {
         var _OPTIONS$tag;
@@ -93,6 +97,8 @@ function collectDependencies(asset, ast) {
             loc: node.location
           });
         }
+
+        // @ts-expect-error TS7053
         let options = (_OPTIONS$tag = OPTIONS[tag]) === null || _OPTIONS$tag === void 0 ? void 0 : _OPTIONS$tag[attr];
         if (node.tag === 'script') {
           options = {
@@ -126,6 +132,7 @@ function collectDependencies(asset, ast) {
     return node;
   });
   if (errors.length > 0) {
+    // @ts-expect-error TS7005
     throw errors;
   }
   if (isDirty) {

package/lib/inline.js

@@ -19,6 +19,8 @@ function _posthtml() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-expect-error TS2724
+
 const SCRIPT_TYPES = {
   'application/ecmascript': 'js',
   'application/javascript': 'js',
@@ -31,6 +33,7 @@ function extractInlineAssets(asset, ast) {
 
   // Extract <style> elements for processing.
   const parts = [];
+  // @ts-expect-error TS2339
   (0, _posthtml().default)().walk.call(program, node => {
     if (node.tag === 'style' || node.tag === 'script') {
       var _node$location;
@@ -46,7 +49,9 @@ function extractInlineAssets(asset, ast) {
           type = 'css';
         }
       } else if (node.tag === 'script') {
+        // @ts-expect-error TS7053
         if (node.attrs && SCRIPT_TYPES[node.attrs.type]) {
+          // @ts-expect-error TS7053
           type = SCRIPT_TYPES[node.attrs.type];
         } else if (node.attrs) {
           type = node.attrs.type.split('/')[1];
@@ -96,10 +101,10 @@ function extractInlineAssets(asset, ast) {
         content: value,
         uniqueKey: parcelKey,
         bundleBehavior: 'inline',
+        // @ts-expect-error TS2322
         env,
         meta: {
           type: 'tag',
-          // $FlowFixMe
           node,
           startLine: (_node$location = node.location) === null || _node$location === void 0 ? void 0 : _node$location.start.line
         }
@@ -124,7 +129,6 @@ function extractInlineAssets(asset, ast) {
         bundleBehavior: 'inline',
         meta: {
           type: 'attr',
-          // $FlowFixMe
           node
         }
       });

package/lib/types/SVGTransformer.d.ts

@@ -0,0 +1,3 @@
+import { Transformer } from '@atlaspack/plugin';
+declare const _default: Transformer<unknown>;
+export default _default;

package/lib/types/dependencies.d.ts

@@ -0,0 +1,3 @@
+import type { AST, MutableAsset } from '@atlaspack/types-internal';
+export declare function parseFuncIRI(value: string): [string, string] | null | undefined;
+export default function collectDependencies(asset: MutableAsset, ast: AST): void;

package/lib/types/inline.d.ts

@@ -0,0 +1,2 @@
+import type { AST, MutableAsset, TransformerResult } from '@atlaspack/types-internal';
+export default function extractInlineAssets(asset: MutableAsset, ast: AST): Array<TransformerResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-svg",
-  "version": "2.14.5-canary.39+42a775de8",
+  "version": "2.14.5-canary.391+053e3754c",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,15 +9,16 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/SVGTransformer.js",
-  "source": "src/SVGTransformer.js",
+  "main": "./lib/SVGTransformer.js",
+  "source": "./src/SVGTransformer.ts",
+  "types": "./lib/types/SVGTransformer.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.107+42a775de8",
-    "@atlaspack/plugin": "2.14.5-canary.39+42a775de8",
-    "@atlaspack/rust": "3.2.1-canary.39+42a775de8",
+    "@atlaspack/diagnostic": "2.14.1-canary.459+053e3754c",
+    "@atlaspack/plugin": "2.14.5-canary.391+053e3754c",
+    "@atlaspack/rust": "3.2.1-canary.391+053e3754c",
     "nullthrows": "^1.1.1",
     "posthtml": "^0.16.5",
     "posthtml-parser": "^0.10.1",
@@ -25,5 +26,11 @@
     "semver": "^7.5.2"
   },
   "type": "commonjs",
-  "gitHead": "42a775de8eec638ad188f3271964170d8c04d84b"
-}
+  "scripts": {
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "devDependencies": {
+    "@types/semver": "^7.7.1"
+  },
+  "gitHead": "053e3754c08c5b5dc239e9f7267df289cbbf31ab"
+}

package/src/{SVGTransformer.js → SVGTransformer.ts}

@@ -1,5 +1,3 @@
-// @flow
-
 import {Transformer} from '@atlaspack/plugin';
 import nullthrows from 'nullthrows';
 import semver from 'semver';
@@ -9,7 +7,7 @@ import collectDependencies from './dependencies';
 import extractInlineAssets from './inline';
 import ThrowableDiagnostic from '@atlaspack/diagnostic';
 
-export default (new Transformer({
+export default new Transformer({
   canReuseAST({ast}) {
     return ast.type === 'posthtml' && semver.satisfies(ast.version, '^0.4.0');
   },
@@ -39,8 +37,9 @@ export default (new Transformer({
 
     try {
       collectDependencies(asset, ast);
-    } catch (errors) {
+    } catch (errors: any) {
       throw new ThrowableDiagnostic({
+        // @ts-expect-error TS7006
         diagnostic: errors.map((error) => ({
           message: error.message,
           origin: '@atlaspack/transformer-svg',
@@ -65,4 +64,4 @@ export default (new Transformer({
       content: render(ast.program),
     };
   },
-}): Transformer);
+}) as Transformer<unknown>;

package/src/{dependencies.js → dependencies.ts}

@@ -1,6 +1,4 @@
-// @flow
-
-import type {AST, MutableAsset} from '@atlaspack/types';
+import type {AST, MutableAsset} from '@atlaspack/types-internal';
 import PostHTML from 'posthtml';
 
 // A list of all attributes that may produce a dependency
@@ -31,7 +29,7 @@ const ATTRS = {
     'tref',
     'color-profile',
   ],
-};
+} as const;
 
 // Attributes that allow url() to reference another element, either in the same document or a different one.
 // https://www.w3.org/TR/SVG11/linking.html#processingIRI
@@ -58,7 +56,9 @@ const FUNC_IRI_ATTRS = new Set([
 const FUNC_IRI_RE =
   /^url\((?:((['"])(.*?)\2(\s+.*)?)|((?:\\[\s'"]|[^\s'"])+))\)$/;
 const ESCAPE_RE = /\\(.|\n|\r|\u2028|\u2029)/;
-export function parseFuncIRI(value: string): ?[string, string] {
+export function parseFuncIRI(
+  value: string,
+): [string, string] | null | undefined {
   let m = value.match(FUNC_IRI_RE);
   if (m) {
     let url = (m[3] || m[5]).replace(ESCAPE_RE, '$1');
@@ -73,11 +73,13 @@ const OPTIONS = {
     href: {needsStableName: true},
     'xlink:href': {needsStableName: true},
   },
-};
+} as const;
 
 export default function collectDependencies(asset: MutableAsset, ast: AST) {
   let isDirty = false;
+  // @ts-expect-error TS7034
   const errors = [];
+  // @ts-expect-error TS2339
   PostHTML().walk.call(ast.program, (node) => {
     // Ideally we'd have location information for specific attributes...
     let getLoc = () =>
@@ -107,6 +109,7 @@ export default function collectDependencies(asset: MutableAsset, ast: AST) {
         continue;
       }
 
+      // @ts-expect-error TS7053
       const elements = ATTRS[attr];
       if (elements && elements.includes(node.tag)) {
         // Check for empty string
@@ -118,6 +121,7 @@ export default function collectDependencies(asset: MutableAsset, ast: AST) {
           });
         }
 
+        // @ts-expect-error TS7053
         let options = OPTIONS[tag]?.[attr];
         if (node.tag === 'script') {
           options = {
@@ -154,6 +158,7 @@ export default function collectDependencies(asset: MutableAsset, ast: AST) {
   });
 
   if (errors.length > 0) {
+    // @ts-expect-error TS7005
     throw errors;
   }
 

package/src/{inline.js → inline.ts}

@@ -1,7 +1,10 @@
-// @flow
-
-import type {AST, MutableAsset, TransformerResult} from '@atlaspack/types';
+import type {
+  AST,
+  MutableAsset,
+  TransformerResult,
+} from '@atlaspack/types-internal';
 import {hashString} from '@atlaspack/rust';
+// @ts-expect-error TS2724
 import type {PostHTMLNode} from 'posthtml';
 
 import PostHTML from 'posthtml';
@@ -11,7 +14,7 @@ const SCRIPT_TYPES = {
   'application/javascript': 'js',
   'text/javascript': 'js',
   module: 'js',
-};
+} as const;
 
 export default function extractInlineAssets(
   asset: MutableAsset,
@@ -22,6 +25,7 @@ export default function extractInlineAssets(
 
   // Extract <style> elements for processing.
   const parts: Array<TransformerResult> = [];
+  // @ts-expect-error TS2339
   PostHTML().walk.call(program, (node: PostHTMLNode) => {
     if (node.tag === 'style' || node.tag === 'script') {
       const value = node.content && node.content.join('');
@@ -37,7 +41,9 @@ export default function extractInlineAssets(
           type = 'css';
         }
       } else if (node.tag === 'script') {
+        // @ts-expect-error TS7053
         if (node.attrs && SCRIPT_TYPES[node.attrs.type]) {
+          // @ts-expect-error TS7053
           type = SCRIPT_TYPES[node.attrs.type];
         } else if (node.attrs) {
           type = node.attrs.type.split('/')[1];
@@ -95,10 +101,10 @@ export default function extractInlineAssets(
         content: value,
         uniqueKey: parcelKey,
         bundleBehavior: 'inline',
+        // @ts-expect-error TS2322
         env,
         meta: {
           type: 'tag',
-          // $FlowFixMe
           node,
           startLine: node.location?.start.line,
         },
@@ -123,7 +129,6 @@ export default function extractInlineAssets(
         bundleBehavior: 'inline',
         meta: {
           type: 'attr',
-          // $FlowFixMe
           node,
         },
       });

package/test/{parseFuncIRI.test.js → parseFuncIRI.test.ts}

@@ -1,4 +1,3 @@
-// @flow
 import {parseFuncIRI} from '../src/dependencies';
 import assert from 'assert';
 

package/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../core/diagnostic/tsconfig.json"
+    },
+    {
+      "path": "../../core/plugin/tsconfig.json"
+    },
+    {
+      "path": "../../core/rust/tsconfig.json"
+    }
+  ]
+}