@rokkit/icons 1.0.0-next.100 → 1.0.0-next.106

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rokkit/icons",
-  "version": "1.0.0-next.100",
+  "version": "1.0.0-next.106",
   "description": "A minimal icon set for use in applications.",
   "author": "Jerry Thomas <me@jerrythomas.name>",
   "license": "MIT",
@@ -8,6 +8,13 @@
   "main": "src/index.js",
   "module": "src/index.js",
   "type": "module",
+  "scripts": {
+    "format": "prettier --write .",
+    "lint": "eslint --fix .",
+    "build": "node src/index.js && pnpm format",
+    "latest": "pnpm upgrade --latest",
+    "release": "pnpm publish --access public"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -34,12 +41,5 @@
     "./auth.json": "./lib/auth.json",
     "./app.json": "./lib/app.json",
     ".": "./lib/base.json"
-  },
-  "scripts": {
-    "format": "prettier --write .",
-    "lint": "eslint --fix .",
-    "build": "node src/index.js && pnpm format",
-    "latest": "pnpm upgrade --latest",
-    "release": "pnpm publish --access public"
   }
-}
+}

package/src/convert.js

@@ -9,33 +9,26 @@ import {
 import fs from 'fs'
 
 /**
- * Convert icons
+ * Clean up and optimise SVG icon
  *
- * @param {string} folder Folder with icons
- * @param {string} prefix Prefix for icon set
+ * @param {string} svg SVG code
  * @param {boolean} color True if color should be preserved
  */
-export async function convert(folder, prefix, color = false) {
-	// Import icons
-	const iconSet = await importDirectory(folder, { prefix })
+export function cleanAndOptimizeIcon(svg, color) {
+	// Clean up icon code
+	cleanupSVG(svg)
 
-	// Validate, clean up, fix palette and optimise
-	processIcons(iconSet, color)
+	if (!color) {
+		parseColors(svg, {
+			defaultColor: 'currentColor',
+			callback: (_, colorStr, value) => {
+				return !value || isEmptyColor(value) ? colorStr : 'currentColor'
+			}
+		})
+	}
 
-	// Export
-	const collection = JSON.stringify(iconSet.export(), null, 2)
-	fs.writeFileSync(`./lib/${prefix}.json`, collection, 'utf8')
-	const target = `./lib/${iconSet.prefix}`
-	await exportJSONPackage(iconSet, {
-		target,
-		package: {
-			name: `@rokkit/${iconSet.prefix}`,
-			version: '1.0.0',
-			bugs: 'https://github.com/jerrythomas/rokkit/issues',
-			homepage: 'https://github.com/jerrythomas/rokkit'
-		},
-		cleanup: true
-	})
+	// Optimise
+	runSVGO(svg)
 }
 
 /**
@@ -44,25 +37,27 @@ export async function convert(folder, prefix, color = false) {
  * @param {IconifyTools} iconSet Icon set
  * @param {boolean} color True if color should be preserved
  */
-function processIcons(iconSet, color) {
-	iconSet.forEach((name, type) => {
-		if (type !== 'icon') {
-			return
-		}
+export function processIcons(iconSet, color) {
+	iconSet.forEach((name) => {
+		// There should not be any type other than icon
+		// if (type !== 'icon') {
+		// 	return
+		// }
 
 		const svg = iconSet.toSVG(name)
-		if (!svg) {
-			// Invalid icon
-			iconSet.remove(name)
-			return
-		}
+		// Since we are processing from within the list, there is no need to check for invalid icons
+		// if (!svg) {
+		// 	// Invalid icon
+		// 	iconSet.remove(name)
+		// 	return
+		// }
 
 		// Clean up and optimise icons
 		try {
 			cleanAndOptimizeIcon(svg, color)
 		} catch (err) {
 			// eslint-disable-next-line no-console
-			console.error(`Error parsing ${name}:`, err)
+			console.error(`Error parsing ${name}: ${err.reason}`)
 			iconSet.remove(name)
 			return
 		}
@@ -73,24 +68,31 @@ function processIcons(iconSet, color) {
 }
 
 /**
- * Clean up and optimise SVG icon
+ * Convert icons
  *
- * @param {string} svg SVG code
+ * @param {string} folder Folder with icons
+ * @param {string} prefix Prefix for icon set
  * @param {boolean} color True if color should be preserved
  */
-function cleanAndOptimizeIcon(svg, color) {
-	// Clean up icon code
-	cleanupSVG(svg)
+export async function convert(folder, prefix, color = false) {
+	// Import icons
+	const iconSet = await importDirectory(folder, { prefix })
 
-	if (!color) {
-		parseColors(svg, {
-			defaultColor: 'currentColor',
-			callback: (_, colorStr, value) => {
-				return !value || isEmptyColor(value) ? colorStr : 'currentColor'
-			}
-		})
-	}
+	// Validate, clean up, fix palette and optimise
+	processIcons(iconSet, color)
 
-	// Optimise
-	runSVGO(svg)
+	// Export
+	const collection = JSON.stringify(iconSet.export(), null, 2)
+	fs.writeFileSync(`./lib/${prefix}.json`, collection, 'utf8')
+	const target = `./lib/${iconSet.prefix}`
+	await exportJSONPackage(iconSet, {
+		target,
+		package: {
+			name: `@rokkit/${iconSet.prefix}`,
+			version: '1.0.0',
+			bugs: 'https://github.com/jerrythomas/rokkit/issues',
+			homepage: 'https://github.com/jerrythomas/rokkit'
+		},
+		cleanup: true
+	})
 }

package/src/index.js

@@ -1,8 +1,15 @@
 #!/usr/bin/env node
+import sade from 'sade'
 import { convert } from './convert.js'
 
-const groups = ['auth', 'app', 'base', 'light', 'solid', 'twotone', 'components']
+function main() {
+	const groups = ['auth', 'app', 'base', 'light', 'solid', 'twotone', 'components']
 
-for (const group of groups) {
-	convert(`./src/${group}`, group, group === 'auth')
+	for (const group of groups) {
+		convert(`./src/${group}`, group, group === 'auth')
+	}
 }
+
+const prog = sade(name, true)
+prog.action(() => main())
+prog.parse(process.argv)

package/LICENCE.md

@@ -1,22 +0,0 @@
-# Pictogrammers Free License
-
-This icon collection is released as free, open source, and GPL friendly by
-the [Pictogrammers](http://pictogrammers.com/) icon group. You may use it
-for commercial projects, open source projects, or anything really.
-
-## Icons: [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
-
-Some of the icons are redistributed under the Apache 2.0 license. All other
-icons are either redistributed under their respective licenses or are
-distributed under the Apache 2.0 license.
-
-## Fonts: [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
-
-All web and desktop fonts are distributed under the Apache 2.0 license. Web
-and desktop fonts contain some icons that are redistributed under the Apache
-2.0 license. All other icons are either redistributed under their respective
-licenses or are distributed under the Apache 2.0 license.
-
-## Code: [MIT](https://opensource.org/licenses/MIT)
-
-The MIT license applies to all non-font and non-icon files.