@wyw-in-js/transform 0.1.0 → 0.2.0

package/types/transform/generators/evalFile.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evalFile = void 0;
 const evaluators_1 = __importDefault(require("../../evaluators"));
-const hasLinariaPreval_1 = __importDefault(require("../../utils/hasLinariaPreval"));
+const hasWywPreval_1 = __importDefault(require("../../utils/hasWywPreval"));
 const UnprocessedEntrypointError_1 = require("../actions/UnprocessedEntrypointError");
 const wrap = (fn) => {
     try {
@@ -23,7 +23,7 @@ const wrap = (fn) => {
 function* evalFile() {
     const { entrypoint } = this;
     const { log } = entrypoint;
-    log(`>> evaluate __linariaPreval`);
+    log(`>> evaluate __wywPreval`);
     let evaluated;
     while (evaluated === undefined) {
         try {
@@ -39,18 +39,18 @@ function* evalFile() {
             }
         }
     }
-    const linariaPreval = (0, hasLinariaPreval_1.default)(evaluated.value)
-        ? evaluated.value.__linariaPreval
+    const wywPreval = (0, hasWywPreval_1.default)(evaluated.value)
+        ? evaluated.value.__wywPreval
         : undefined;
-    if (!linariaPreval) {
+    if (!wywPreval) {
         return null;
     }
     const valueCache = new Map();
-    Object.entries(linariaPreval).forEach(([key, lazyValue]) => {
+    Object.entries(wywPreval).forEach(([key, lazyValue]) => {
         const value = wrap(lazyValue);
         valueCache.set(key, value);
     });
-    log(`<< evaluated __linariaPreval %O`, valueCache);
+    log(`<< evaluated __wywPreval %O`, valueCache);
     return [valueCache, evaluated.dependencies];
 }
 exports.evalFile = evalFile;

package/types/transform/generators/extract.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extract = exports.transformUrl = void 0;
 const path_1 = __importDefault(require("path"));
 const source_map_1 = require("source-map");
-const stylis_1 = __importDefault(require("stylis"));
-const STYLIS_DECLARATION = 1;
+const stylis_1 = require("stylis");
 const posixSep = path_1.default.posix.sep;
 function transformUrl(url, outputFilename, sourceFilename, platformPath = path_1.default) {
     // Replace asset path with new path relative to the output CSS
@@ -20,6 +19,25 @@ function transformUrl(url, outputFilename, sourceFilename, platformPath = path_1
     return relative.split(platformPath.sep).join(posixSep);
 }
 exports.transformUrl = transformUrl;
+function createStylisPreprocessor(options) {
+    function stylisPreprocess(selector, text) {
+        return (0, stylis_1.serialize)((0, stylis_1.compile)(`${selector} {${text}}\n`), (0, stylis_1.middleware)([
+            (element) => {
+                const { outputFilename } = options;
+                if (element.type === 'decl' && outputFilename) {
+                    // When writing to a file, we need to adjust the relative paths inside url(..) expressions.
+                    // It'll allow css-loader to resolve an imported asset properly.
+                    // eslint-disable-next-line no-param-reassign
+                    element.return = element.value.replace(/\b(url\((["']?))(\.[^)]+?)(\2\))/g, (match, p1, p2, p3, p4) => p1 + transformUrl(p3, outputFilename, options.filename) + p4);
+                }
+            },
+            stylis_1.namespace,
+            stylis_1.prefixer,
+            stylis_1.stringify,
+        ]));
+    }
+    return stylisPreprocess;
+}
 function extractCssFromAst(rules, originalCode, options) {
     const mappings = [];
     let cssText = '';
@@ -35,16 +53,7 @@ function extractCssFromAst(rules, originalCode, options) {
                 break;
             case 'stylis':
             default:
-                stylis_1.default.use(null)((context, decl) => {
-                    const { outputFilename } = options;
-                    if (context === STYLIS_DECLARATION && outputFilename) {
-                        // When writing to a file, we need to adjust the relative paths inside url(..) expressions
-                        // It'll allow css-loader to resolve an imported asset properly
-                        return decl.replace(/\b(url\((["']?))(\.[^)]+?)(\2\))/g, (match, p1, p2, p3, p4) => p1 + transformUrl(p3, outputFilename, options.filename) + p4);
-                    }
-                    return decl;
-                });
-                preprocessor = stylis_1.default;
+                preprocessor = createStylisPreprocessor(options);
         }
     }
     Object.keys(rules).forEach((selector, index) => {

package/types/transform/generators/transform.js

@@ -22,7 +22,7 @@ function runPreevalStage(babel, evalConfig, pluginOptions, code, originalAst, ev
     ];
     const transformConfig = (0, buildOptions_1.buildOptions)({
         ...evalConfig,
-        envName: 'linaria',
+        envName: 'wyw-in-js',
         plugins,
     });
     const result = babel.transformFromAstSync(originalAst, code, transformConfig);
@@ -42,9 +42,7 @@ const prepareCode = (services, item, originalAst) => {
     const { pluginOptions } = options;
     const preevalStageResult = eventEmitter.perf('transform:preeval', () => runPreevalStage(babel, evalConfig, pluginOptions, code, originalAst, eventEmitter));
     const transformMetadata = (0, TransformMetadata_1.getTransformMetadata)(preevalStageResult.metadata);
-    if (only.length === 1 &&
-        only[0] === '__linariaPreval' &&
-        !transformMetadata) {
+    if (only.length === 1 && only[0] === '__wywPreval' && !transformMetadata) {
         log('[evaluator:end] no metadata');
         return [preevalStageResult.code, null, null];
     }

package/types/transform/generators/workflow.js

@@ -29,10 +29,10 @@ function* workflow() {
     }
     const originalCode = entrypoint.loadedAndParsed.code ?? '';
     // File is ignored or does not contain any tags. Return original code.
-    if (!entrypoint.hasLinariaMetadata()) {
+    if (!entrypoint.hasWywMetadata()) {
         if (entrypoint.generation === 1) {
-            // 1st generation here means that it's __linariaPreval entrypoint
-            // without __linariaPreval, so we don't need it cached
+            // 1st generation here means that it's __wywPreval entrypoint
+            // without __wywPreval, so we don't need it cached
             cache.delete('entrypoints', entrypoint.name);
         }
         return {

package/types/transform/helpers/{loadLinariaOptions.d.ts → loadWywOptions.d.ts}

@@ -3,4 +3,4 @@ import type { PluginOptions } from '../../types';
 export type PartialOptions = Partial<Omit<PluginOptions, 'features'>> & {
     features?: Partial<FeatureFlags>;
 };
-export declare function loadLinariaOptions(overrides?: PartialOptions): StrictOptions;
+export declare function loadWywOptions(overrides?: PartialOptions): StrictOptions;

package/types/transform/helpers/{loadLinariaOptions.js → loadWywOptions.js}

@@ -3,30 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadLinariaOptions = void 0;
+exports.loadWywOptions = void 0;
 const cosmiconfig_1 = require("cosmiconfig");
 const shaker_1 = __importDefault(require("../../shaker"));
 const searchPlaces = [
-    `.linariarc`,
-    `.linariarc.json`,
-    `.linariarc.yaml`,
-    `.linariarc.yml`,
-    `.linariarc.js`,
-    `.linariarc.cjs`,
-    `.config/linariarc`,
-    `.config/linariarc.json`,
-    `.config/linariarc.yaml`,
-    `.config/linariarc.yml`,
-    `.config/linariarc.js`,
-    `.config/linariarc.cjs`,
-    `linaria.config.js`,
-    `linaria.config.cjs`,
+    `.wyw-in-jsrc`,
+    `.wyw-in-jsrc.json`,
+    `.wyw-in-jsrc.yaml`,
+    `.wyw-in-jsrc.yml`,
+    `.wyw-in-jsrc.js`,
+    `.wyw-in-jsrc.cjs`,
+    `.config/wyw-in-jsrc`,
+    `.config/wyw-in-jsrc.json`,
+    `.config/wyw-in-jsrc.yaml`,
+    `.config/wyw-in-jsrc.yml`,
+    `.config/wyw-in-jsrc.js`,
+    `.config/wyw-in-jsrc.cjs`,
+    `wyw-in-js.config.js`,
+    `wyw-in-js.config.cjs`,
 ];
-const explorerSync = (0, cosmiconfig_1.cosmiconfigSync)('linaria', { searchPlaces });
+const explorerSync = (0, cosmiconfig_1.cosmiconfigSync)('wyw-in-js', { searchPlaces });
 const cache = new WeakMap();
 const defaultOverrides = {};
 const nodeModulesRegExp = /[\\/]node_modules[\\/]/;
-function loadLinariaOptions(overrides = defaultOverrides) {
+function loadWywOptions(overrides = defaultOverrides) {
     if (cache.has(overrides)) {
         return cache.get(overrides);
     }
@@ -65,7 +65,7 @@ function loadLinariaOptions(overrides = defaultOverrides) {
                         return false;
                     }
                     // If a file contains `export` or `import` keywords, we assume it's an ES-module
-                    return /(?:^|\*\/|;)\s*(?:export|import)\s/m.test(code);
+                    return /(?:^|\*\/|;|})\s*(?:export|import)[\s{]/m.test(code);
                 },
                 action: shaker_1.default,
             },
@@ -83,4 +83,4 @@ function loadLinariaOptions(overrides = defaultOverrides) {
     cache.set(overrides, options);
     return options;
 }
-exports.loadLinariaOptions = loadLinariaOptions;
+exports.loadWywOptions = loadWywOptions;

package/types/transform.d.ts

@@ -1,12 +1,13 @@
 /**
- * This file exposes transform function that:
+ * This file exposes sync and async transform functions that:
  * - parse the passed code to AST
- * - transforms the AST using Linaria babel preset ('./babel/index.js) and additional config defined in Linaria config file or passed to bundler configuration.
- * - runs generated CSS files through default of user-defined preprocessor
- * - generates source maps for CSS files
- * - return transformed code (without Linaria template literals), generated CSS, source maps and babel metadata from transform step.
+ * - builds a dependency graph for the file
+ * - shakes each dependency and removes unused code
+ * - runs generated code in a sandbox
+ * - collects artifacts
+ * - returns transformed code (without WYW template literals), generated CSS, source maps and babel metadata from transform step.
  */
-import type { PartialOptions } from './transform/helpers/loadLinariaOptions';
+import type { PartialOptions } from './transform/helpers/loadWywOptions';
 import type { Handlers, Services } from './transform/types';
 import type { Result } from './types';
 type PartialServices = Partial<Omit<Services, 'options'>> & {

package/types/transform.js

@@ -1,25 +1,26 @@
 "use strict";
 /**
- * This file exposes transform function that:
+ * This file exposes sync and async transform functions that:
  * - parse the passed code to AST
- * - transforms the AST using Linaria babel preset ('./babel/index.js) and additional config defined in Linaria config file or passed to bundler configuration.
- * - runs generated CSS files through default of user-defined preprocessor
- * - generates source maps for CSS files
- * - return transformed code (without Linaria template literals), generated CSS, source maps and babel metadata from transform step.
+ * - builds a dependency graph for the file
+ * - shakes each dependency and removes unused code
+ * - runs generated code in a sandbox
+ * - collects artifacts
+ * - returns transformed code (without WYW template literals), generated CSS, source maps and babel metadata from transform step.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform = exports.transformSync = void 0;
 const shared_1 = require("@wyw-in-js/shared");
+const loadWywOptions_1 = require("./transform/helpers/loadWywOptions");
 const cache_1 = require("./cache");
 const Entrypoint_1 = require("./transform/Entrypoint");
 const actionRunner_1 = require("./transform/actions/actionRunner");
 const generators_1 = require("./transform/generators");
 const resolveImports_1 = require("./transform/generators/resolveImports");
-const loadLinariaOptions_1 = require("./transform/helpers/loadLinariaOptions");
 const withDefaultServices_1 = require("./transform/helpers/withDefaultServices");
 function transformSync(partialServices, originalCode, syncResolve, customHandlers = {}) {
     const { options } = partialServices;
-    const pluginOptions = (0, loadLinariaOptions_1.loadLinariaOptions)(options.pluginOptions);
+    const pluginOptions = (0, loadWywOptions_1.loadWywOptions)(options.pluginOptions);
     const services = (0, withDefaultServices_1.withDefaultServices)({
         ...partialServices,
         options: {
@@ -31,7 +32,7 @@ function transformSync(partialServices, originalCode, syncResolve, customHandler
         // If global cache is disabled, we need to create a new cache for each file
         services.cache = new cache_1.TransformCacheCollection();
     }
-    const entrypoint = Entrypoint_1.Entrypoint.createRoot(services, options.filename, ['__linariaPreval'], originalCode);
+    const entrypoint = Entrypoint_1.Entrypoint.createRoot(services, options.filename, ['__wywPreval'], originalCode);
     if (entrypoint.ignored) {
         return {
             code: originalCode,
@@ -66,7 +67,7 @@ function transformSync(partialServices, originalCode, syncResolve, customHandler
 exports.transformSync = transformSync;
 async function transform(partialServices, originalCode, asyncResolve, customHandlers = {}) {
     const { options } = partialServices;
-    const pluginOptions = (0, loadLinariaOptions_1.loadLinariaOptions)(options.pluginOptions);
+    const pluginOptions = (0, loadWywOptions_1.loadWywOptions)(options.pluginOptions);
     const services = (0, withDefaultServices_1.withDefaultServices)({
         ...partialServices,
         options: {
@@ -86,7 +87,7 @@ async function transform(partialServices, originalCode, asyncResolve, customHand
      * but the "only" option has changed, the file will be re-processed using
      * the combined "only" option.
      */
-    const entrypoint = Entrypoint_1.Entrypoint.createRoot(services, options.filename, ['__linariaPreval'], originalCode);
+    const entrypoint = Entrypoint_1.Entrypoint.createRoot(services, options.filename, ['__wywPreval'], originalCode);
     if (entrypoint.ignored) {
         return {
             code: originalCode,

package/types/types.d.ts

@@ -22,7 +22,7 @@ export interface IPluginState extends PluginPass {
     dependencies: Dependencies;
     file: BabelFile & {
         metadata: {
-            linaria?: WYWTransformMetadata;
+            wywInJS?: WYWTransformMetadata;
         };
     };
     processors: BaseProcessor[];

package/types/utils/ShakerMetadata.d.ts

@@ -2,6 +2,6 @@ export interface IShakerMetadata {
     imports: Map<string, string[]>;
 }
 export interface IMetadata {
-    linariaEvaluator: IShakerMetadata;
+    wywEvaluator: IShakerMetadata;
 }
 export declare const hasShakerMetadata: (metadata: object | undefined) => metadata is IMetadata;

package/types/utils/ShakerMetadata.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasShakerMetadata = void 0;
-const hasShakerMetadata = (metadata) => metadata !== undefined && 'linariaEvaluator' in metadata;
+const hasShakerMetadata = (metadata) => metadata !== undefined && 'wywEvaluator' in metadata;
 exports.hasShakerMetadata = hasShakerMetadata;

package/types/utils/addIdentifierToWywPreval.d.ts

@@ -0,0 +1,4 @@
+import type { NodePath, Scope } from '@babel/traverse';
+import type { ObjectExpression } from '@babel/types';
+export declare function getOrAddWywPreval(scope: Scope): NodePath<ObjectExpression>;
+export declare function addIdentifierToWywPreval(scope: Scope, name: string): void;

package/types/utils/{addIdentifierToLinariaPreval.js → addIdentifierToWywPreval.js}

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addIdentifierToLinariaPreval = exports.getOrAddLinariaPreval = void 0;
+exports.addIdentifierToWywPreval = exports.getOrAddWywPreval = void 0;
 const createId_1 = require("./createId");
 const scopeHelpers_1 = require("./scopeHelpers");
-function getOrAddLinariaPreval(scope) {
+function getOrAddWywPreval(scope) {
     const rootScope = scope.getProgramParent();
     const programPath = rootScope.path;
-    let object = programPath.getData('__linariaPreval');
+    let object = programPath.getData('__wywPreval');
     if (object) {
         return object;
     }
     if (programPath.node.sourceType === 'script') {
-        // CJS exports.__linariaPreval = {};
+        // CJS exports.__wywPreval = {};
         const prevalExport = {
             expression: {
                 type: 'AssignmentExpression',
@@ -19,7 +19,7 @@ function getOrAddLinariaPreval(scope) {
                 left: {
                     computed: false,
                     object: (0, createId_1.createId)('exports'),
-                    property: (0, createId_1.createId)('__linariaPreval'),
+                    property: (0, createId_1.createId)('__wywPreval'),
                     type: 'MemberExpression',
                 },
                 right: {
@@ -33,12 +33,12 @@ function getOrAddLinariaPreval(scope) {
         object = inserted.get('expression.right');
     }
     else {
-        // ESM export const __linariaPreval = {};
+        // ESM export const __wywPreval = {};
         const prevalExport = {
             declaration: {
                 declarations: [
                     {
-                        id: (0, createId_1.createId)('__linariaPreval'),
+                        id: (0, createId_1.createId)('__wywPreval'),
                         init: {
                             properties: [],
                             type: 'ObjectExpression',
@@ -55,13 +55,13 @@ function getOrAddLinariaPreval(scope) {
         const [inserted] = programPath.pushContainer('body', [prevalExport]);
         object = inserted.get('declaration.declarations.0.init');
     }
-    programPath.setData('__linariaPreval', object);
+    programPath.setData('__wywPreval', object);
     return object;
 }
-exports.getOrAddLinariaPreval = getOrAddLinariaPreval;
-function addIdentifierToLinariaPreval(scope, name) {
+exports.getOrAddWywPreval = getOrAddWywPreval;
+function addIdentifierToWywPreval(scope, name) {
     const rootScope = scope.getProgramParent();
-    const object = getOrAddLinariaPreval(rootScope);
+    const object = getOrAddWywPreval(rootScope);
     const newProperty = {
         type: 'ObjectProperty',
         key: (0, createId_1.createId)(name),
@@ -72,4 +72,4 @@ function addIdentifierToLinariaPreval(scope, name) {
     const [inserted] = object.pushContainer('properties', [newProperty]);
     (0, scopeHelpers_1.reference)(inserted.get('value'));
 }
-exports.addIdentifierToLinariaPreval = addIdentifierToLinariaPreval;
+exports.addIdentifierToWywPreval = addIdentifierToWywPreval;