@iconify/tools 2.0.12 → 2.0.13

package/lib/download/git/index.js

@@ -6,6 +6,7 @@ const prepare_1 = require("../../export/helpers/prepare");
 const exec_1 = require("../../misc/exec");
 const branch_1 = require("./branch");
 const hash_1 = require("./hash");
+const reset_1 = require("./reset");
 async function downloadGitRepo(options) {
     const { remote, branch } = options;
     // Check for last commit
@@ -32,6 +33,8 @@ async function downloadGitRepo(options) {
                             ? ifModifiedSince.hash
                             : null;
                 if (latestHash === expectedHash) {
+                    // Reset contents before returning
+                    await (0, reset_1.resetGitRepoContents)(options.target);
                     return 'not_modified';
                 }
             }
@@ -51,6 +54,15 @@ async function downloadGitRepo(options) {
         }
         await (0, exec_1.execAsync)(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
     }
+    else {
+        // Attempt to reset contents
+        try {
+            await (0, reset_1.resetGitRepoContents)(options.target);
+        }
+        catch (err) {
+            //
+        }
+    }
     // Get latest hash and make sure correct branch is available
     const hash = await (0, hash_1.getGitRepoHash)(options);
     await (0, branch_1.getGitRepoBranch)(options, branch);

package/lib/download/git/index.mjs

@@ -6,6 +6,7 @@ import {
 import { execAsync } from "../../misc/exec.mjs";
 import { getGitRepoBranch } from "./branch.mjs";
 import { getGitRepoHash } from "./hash.mjs";
+import { resetGitRepoContents } from "./reset.mjs";
 async function downloadGitRepo(options) {
   const { remote, branch } = options;
   const hasHashInTarget = options.target.indexOf("{hash}") !== -1;
@@ -22,6 +23,7 @@ async function downloadGitRepo(options) {
       if (ifModifiedSince) {
         const expectedHash = ifModifiedSince === true ? await getGitRepoHash(options) : typeof ifModifiedSince === "string" ? ifModifiedSince : ifModifiedSince.downloadType === "git" ? ifModifiedSince.hash : null;
         if (latestHash === expectedHash) {
+          await resetGitRepoContents(options.target);
           return "not_modified";
         }
       }
@@ -36,6 +38,11 @@ async function downloadGitRepo(options) {
       console.log(`Cloning ${remote}#${branch} to ${target}`);
     }
     await execAsync(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
+  } else {
+    try {
+      await resetGitRepoContents(options.target);
+    } catch (err) {
+    }
   }
   const hash = await getGitRepoHash(options);
   await getGitRepoBranch(options, branch);

package/lib/download/git/reset.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Reset Git repo contents
+ */
+export declare function resetGitRepoContents(target: string): Promise<void>;

package/lib/download/git/reset.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetGitRepoContents = void 0;
+const __1 = require("../..");
+/**
+ * Reset Git repo contents
+ */
+async function resetGitRepoContents(target) {
+    await (0, __1.execAsync)('git add -A', {
+        cwd: target,
+    });
+    await (0, __1.execAsync)('git reset --hard --quiet', {
+        cwd: target,
+    });
+}
+exports.resetGitRepoContents = resetGitRepoContents;

package/lib/download/git/reset.mjs

@@ -0,0 +1,13 @@
+// src/download/git/reset.ts
+import { execAsync } from "../../index.mjs";
+async function resetGitRepoContents(target) {
+  await execAsync("git add -A", {
+    cwd: target
+  });
+  await execAsync("git reset --hard --quiet", {
+    cwd: target
+  });
+}
+export {
+  resetGitRepoContents
+};

package/lib/export/json-package.js

@@ -51,7 +51,12 @@ async function exportJSONPackage(iconSet, options) {
         }
     });
     // Contents
-    const info = exportedJSON.info;
+    const info = exportedJSON.info
+        ? {
+            prefix: iconSet.prefix,
+            ...exportedJSON.info,
+        }
+        : void 0;
     const contents = {
         icons,
         info,

package/lib/export/json-package.mjs

@@ -41,7 +41,10 @@ async function exportJSONPackage(iconSet, options) {
       hasMetadata = true;
     }
   });
-  const info = exportedJSON.info;
+  const info = exportedJSON.info ? {
+    prefix: iconSet.prefix,
+    ...exportedJSON.info
+  } : void 0;
   const contents = {
     icons,
     info,

package/lib/icon-set/index.js

@@ -42,7 +42,7 @@ class IconSet {
     load(data) {
         this.prefix = data.prefix;
         // Defaults
-        const defaultProps = (0, props_1.filterProps)(data);
+        const defaultProps = (0, props_1.filterProps)(data, true);
         // Add icons
         this.entries = Object.create(null);
         const entries = this.entries;
@@ -51,7 +51,10 @@ class IconSet {
             const entry = {
                 type: 'icon',
                 body: item.body,
-                props: { ...defaultProps, ...(0, props_1.filterProps)(item) },
+                props: (0, props_1.filterProps)({
+                    ...defaultProps,
+                    ...item,
+                }, true),
                 chars: new Set(),
                 categories: new Set(),
             };
@@ -62,7 +65,7 @@ class IconSet {
             for (const name in data.aliases) {
                 const item = data.aliases[name];
                 const parent = item.parent;
-                const props = (0, props_1.filterProps)(item);
+                const props = (0, props_1.filterProps)(item, false);
                 const chars = new Set();
                 if (Object.keys(props).length) {
                     // Variation
@@ -599,7 +602,7 @@ class IconSet {
         return this.setItem(name, {
             type: 'icon',
             body: icon.body,
-            props: (0, props_1.filterProps)(icon),
+            props: (0, props_1.filterProps)(icon, true),
             chars: new Set(),
             categories: new Set(),
         });

package/lib/icon-set/index.mjs

@@ -21,7 +21,7 @@ var IconSet = class {
   }
   load(data) {
     this.prefix = data.prefix;
-    const defaultProps = filterProps(data);
+    const defaultProps = filterProps(data, true);
     this.entries = Object.create(null);
     const entries = this.entries;
     for (const name in data.icons) {
@@ -29,7 +29,10 @@ var IconSet = class {
       const entry = {
         type: "icon",
         body: item.body,
-        props: { ...defaultProps, ...filterProps(item) },
+        props: filterProps({
+          ...defaultProps,
+          ...item
+        }, true),
         chars: new Set(),
         categories: new Set()
       };
@@ -39,7 +42,7 @@ var IconSet = class {
       for (const name in data.aliases) {
         const item = data.aliases[name];
         const parent = item.parent;
-        const props = filterProps(item);
+        const props = filterProps(item, false);
         const chars = new Set();
         if (Object.keys(props).length) {
           const entry = {
@@ -473,7 +476,7 @@ var IconSet = class {
     return this.setItem(name, {
       type: "icon",
       body: icon.body,
-      props: filterProps(icon),
+      props: filterProps(icon, true),
       chars: new Set(),
       categories: new Set()
     });

package/lib/icon-set/props.d.ts

@@ -7,4 +7,4 @@ export declare const defaultCommonProps: Required<CommonIconProps>;
 /**
  * Filter icon props: copies properties, removing undefined and default entries
  */
-export declare function filterProps(data: CommonIconProps): CommonIconProps;
+export declare function filterProps(data: CommonIconProps, compareDefaultValues: boolean): CommonIconProps;

package/lib/icon-set/props.js

@@ -19,12 +19,13 @@ const props = Object.keys(exports.defaultCommonProps);
 /**
  * Filter icon props: copies properties, removing undefined and default entries
  */
-function filterProps(data) {
+function filterProps(data, compareDefaultValues) {
     const result = {};
     props.forEach((attr) => {
         const value = data[attr];
         if (value !== void 0 &&
-            value !== exports.defaultCommonProps[attr]) {
+            (!compareDefaultValues ||
+                value !== exports.defaultCommonProps[attr])) {
             result[attr] = value;
         }
     });

package/lib/icon-set/props.mjs

@@ -8,11 +8,11 @@ var defaultCommonProps = {
   ...extraDefaultProps
 };
 var props = Object.keys(defaultCommonProps);
-function filterProps(data) {
+function filterProps(data, compareDefaultValues) {
   const result = {};
   props.forEach((attr) => {
     const value = data[attr];
-    if (value !== void 0 && value !== defaultCommonProps[attr]) {
+    if (value !== void 0 && (!compareDefaultValues || value !== defaultCommonProps[attr])) {
       result[attr] = value;
     }
   });

package/lib/import/figma/nodes.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFigmaIconNodes = void 0;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars-experimental, @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function assertNever(v) {
     //
 }
@@ -24,9 +24,8 @@ async function getFigmaIconNodes(document, options) {
                 if (iconNode.absoluteBoundingBox) {
                     const box = iconNode.absoluteBoundingBox;
                     const item = {
-                        id: node.id,
+                        ...node,
                         type: iconNodeType,
-                        name: node.name,
                         width: box.width,
                         height: box.height,
                         parents,
@@ -70,9 +69,8 @@ async function getFigmaIconNodes(document, options) {
             case 'FRAME':
             case 'GROUP': {
                 const parentItem = {
-                    id: node.id,
+                    ...node,
                     type: parentNodeType,
-                    name: node.name,
                 };
                 const newParents = parents.concat([parentItem]);
                 if (!parents.length && options.pages) {

package/lib/import/figma/nodes.mjs

@@ -16,9 +16,8 @@ async function getFigmaIconNodes(document, options) {
         if (iconNode.absoluteBoundingBox) {
           const box = iconNode.absoluteBoundingBox;
           const item = {
-            id: node.id,
+            ...node,
             type: iconNodeType,
-            name: node.name,
             width: box.width,
             height: box.height,
             parents
@@ -57,9 +56,8 @@ async function getFigmaIconNodes(document, options) {
       case "FRAME":
       case "GROUP": {
         const parentItem = {
-          id: node.id,
-          type: parentNodeType,
-          name: node.name
+          ...node,
+          type: parentNodeType
         };
         const newParents = parents.concat([parentItem]);
         if (!parents.length && options.pages) {

package/lib/index.d.ts

@@ -15,6 +15,7 @@ export { importDirectory } from './import/directory';
 export { downloadGitRepo } from './download/git/index';
 export { getGitRepoHash } from './download/git/hash';
 export { getGitRepoBranch } from './download/git/branch';
+export { resetGitRepoContents } from './download/git/reset';
 export { downloadGitHubRepo } from './download/github/index';
 export { getGitHubRepoHash } from './download/github/hash';
 export { downloadGitLabRepo } from './download/gitlab/index';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendAPIQuery = exports.bumpVersion = exports.cleanupIconKeyword = exports.execAsync = exports.untar = exports.unzip = exports.compareDirectories = exports.scanDirectory = exports.prepareDirectoryForExport = exports.writeJSONFile = exports.exportJSONPackage = exports.exportIconPackage = exports.exportToDirectory = exports.cleanupGlobalStyle = exports.scaleSVG = exports.deOptimisePaths = exports.runSVGO = exports.validateColors = exports.isEmptyColor = exports.parseColors = exports.downloadPackage = exports.getPackageVersion = exports.getNPMVersion = exports.downloadNPMPackage = exports.getGitLabRepoHash = exports.downloadGitLabRepo = exports.getGitHubRepoHash = exports.downloadGitHubRepo = exports.getGitRepoBranch = exports.getGitRepoHash = exports.downloadGitRepo = exports.importDirectory = exports.importFromFigma = exports.mergeIconSets = exports.blankIconSet = exports.IconSet = exports.convertStyleToAttrs = exports.cleanupSVGRoot = exports.cleanupInlineStyle = exports.checkBadTags = exports.removeBadAttributes = exports.cleanupSVG = exports.analyseSVGStructure = exports.parseSVGStyle = exports.parseSVG = exports.SVG = void 0;
+exports.sendAPIQuery = exports.bumpVersion = exports.cleanupIconKeyword = exports.execAsync = exports.untar = exports.unzip = exports.compareDirectories = exports.scanDirectory = exports.prepareDirectoryForExport = exports.writeJSONFile = exports.exportJSONPackage = exports.exportIconPackage = exports.exportToDirectory = exports.cleanupGlobalStyle = exports.scaleSVG = exports.deOptimisePaths = exports.runSVGO = exports.validateColors = exports.isEmptyColor = exports.parseColors = exports.downloadPackage = exports.getPackageVersion = exports.getNPMVersion = exports.downloadNPMPackage = exports.getGitLabRepoHash = exports.downloadGitLabRepo = exports.getGitHubRepoHash = exports.downloadGitHubRepo = exports.resetGitRepoContents = exports.getGitRepoBranch = exports.getGitRepoHash = exports.downloadGitRepo = exports.importDirectory = exports.importFromFigma = exports.mergeIconSets = exports.blankIconSet = exports.IconSet = exports.convertStyleToAttrs = exports.cleanupSVGRoot = exports.cleanupInlineStyle = exports.checkBadTags = exports.removeBadAttributes = exports.cleanupSVG = exports.analyseSVGStructure = exports.parseSVGStyle = exports.parseSVG = exports.SVG = void 0;
 // SVG class and functions
 var index_1 = require("./svg/index");
 Object.defineProperty(exports, "SVG", { enumerable: true, get: function () { return index_1.SVG; } });
@@ -41,6 +41,8 @@ var hash_1 = require("./download/git/hash");
 Object.defineProperty(exports, "getGitRepoHash", { enumerable: true, get: function () { return hash_1.getGitRepoHash; } });
 var branch_1 = require("./download/git/branch");
 Object.defineProperty(exports, "getGitRepoBranch", { enumerable: true, get: function () { return branch_1.getGitRepoBranch; } });
+var reset_1 = require("./download/git/reset");
+Object.defineProperty(exports, "resetGitRepoContents", { enumerable: true, get: function () { return reset_1.resetGitRepoContents; } });
 var index_5 = require("./download/github/index");
 Object.defineProperty(exports, "downloadGitHubRepo", { enumerable: true, get: function () { return index_5.downloadGitHubRepo; } });
 var hash_2 = require("./download/github/hash");

package/lib/index.mjs

@@ -16,6 +16,7 @@ import { importDirectory } from "./import/directory.mjs";
 import { downloadGitRepo } from "./download/git/index.mjs";
 import { getGitRepoHash } from "./download/git/hash.mjs";
 import { getGitRepoBranch } from "./download/git/branch.mjs";
+import { resetGitRepoContents } from "./download/git/reset.mjs";
 import { downloadGitHubRepo } from "./download/github/index.mjs";
 import { getGitHubRepoHash } from "./download/github/hash.mjs";
 import { downloadGitLabRepo } from "./download/gitlab/index.mjs";
@@ -81,6 +82,7 @@ export {
   parseSVGStyle,
   prepareDirectoryForExport,
   removeBadAttributes,
+  resetGitRepoContents,
   runSVGO,
   scaleSVG,
   scanDirectory,

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@iconify/tools",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.0.12",
+	"version": "2.0.13",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -120,6 +120,10 @@
 			"require": "./lib/download/git/index.js",
 			"import": "./lib/download/git/index.mjs"
 		},
+		"./lib/download/git/reset": {
+			"require": "./lib/download/git/reset.js",
+			"import": "./lib/download/git/reset.mjs"
+		},
 		"./lib/download/github/hash": {
 			"require": "./lib/download/github/hash.js",
 			"import": "./lib/download/github/hash.mjs"