Merge pull request #19 from JimGitFE/development

Development 1.5.4

Author: JimGitFE

package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-utilities-generator",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "TypeScript utility package that simplifies working with CSS properties by providing shorthand notations for common CSS class names. Ideal for developers who want to streamline their CSS styling process, this package helps you translate short, intuitive class names into full CSS properties and values, ensuring your code is cleaner and more maintainable.",
   "main": "dist/generator.js",
   "types": "dist/generator.d.ts",

src/helpers.ts

@@ -77,7 +77,7 @@ function inDictionary(dictionary: Record<string, any>, shortKey: string): boolea
  * ```
  */
 const filterClasses = (classes: string[]): utilityClass[] => {
-    const {acceptAnyVariable: notAcceptAny = true, acceptAnyKey = false, acceptAnyValue = true} = readConfigFile()
+    const {acceptAnyVariable = false, acceptAnyKey = false, acceptAnyValue = true} = readConfigFile()
     let utilityClasses: utilityClass[] = [];
 
     /** @example ["m-1.6:hover", "m", "1.6"] */
@@ -98,7 +98,7 @@ const filterClasses = (classes: string[]): utilityClass[] => {
           const isDuplicate = utilityClasses.some((p) => p.fullClass === singleClass);
 
           // Key exist in dictionary
-          const valueCheck = (!notAcceptAny || acceptAnyKey) || (inDictionary(shortKeys, classKey))
+          const valueCheck = (acceptAnyVariable || acceptAnyKey) || (inDictionary(shortKeys, classKey))
 
           if (!isDuplicate && (valueCheck)) {
             // Generate Valid utilityClass
@@ -122,8 +122,8 @@ const filterClasses = (classes: string[]): utilityClass[] => {
         const valueIsNum = /^\d+$/.test(String(classValue))
 
         // Key & Value exist in dictionary || or use them as is
-        const keyCheck = (!notAcceptAny || acceptAnyKey) || inDictionary(shortKeys, classKey)
-        const valueCheck = (!notAcceptAny || acceptAnyValue) || (valueIsNum || inDictionary(shortValues, classValue))
+        const keyCheck = (acceptAnyVariable || acceptAnyKey) || inDictionary(shortKeys, classKey)
+        const valueCheck = (acceptAnyVariable || acceptAnyValue) || (valueIsNum || inDictionary(shortValues, classValue))
 
 
         if (!isDuplicate && (keyCheck && valueCheck)) {

src/init.ts

@@ -4,7 +4,7 @@ import { addScriptToPackageJson, writeFileInRoot, askUser, isValidPath } from '.
 
 /** Default configuration */
 let cuconfig = {
-    acceptAnyVariable: true,
+    acceptAnyVariable: false,
     acceptAnyValue: true,
     readFrom: "./",
     writeTo: "./styles/utilities.css",

src/tests/config.spec.js

@@ -3,37 +3,37 @@ const { createConfigFile, deleteConfigFile } = require('../../dist/tests/utils.j
 
 // acceptAnyVariable Config
 
-test('Accept only keys & values in dictionary {"acceptAnyVariable": true} ', () => {
+test('Accept only keys & values in dictionary {"acceptAnyVariable": false} ', () => {
     // Test proeprties in dictionary
     const attributes = ["height-25px", "anykey-anyvalue"]
 
     // Usage
-    createConfigFile({"acceptAnyVariable": true});
+    createConfigFile({"acceptAnyVariable": false});
 
     expect(filterClasses(attributes)).toEqual([
 
     ]);
 });
 
-test('Accept any property key & value {"acceptAnyVariable": false}', () => {
+test('Accept any property key & value {"acceptAnyVariable": true}', () => {
     // Test any properties
     const attributes = ["height-2rem", "anykey-anyvalue"]
 
     // Usage
-    createConfigFile({"acceptAnyVariable": false});
+    createConfigFile({"acceptAnyVariable": true});
 
     expect(filterClasses(attributes)).toEqual([ 
         { fullClass: 'height-2rem', classKey: 'height', classValue: '2rem' }, 
         { fullClass: 'anykey-anyvalue', classKey: 'anykey', classValue: 'anyvalue' }, 
     ]);
 });
 
-test('Accept any property key & value {"acceptAnyVariable": false}', () => {
+test('Accept any property key & value {"acceptAnyVariable": true}', () => {
     // Test any properties
     const attributes = ["height-2rem", "anykey-anyvalue"]
 
     // Usage
-    createConfigFile({"acceptAnyVariable": false});
+    createConfigFile({"acceptAnyVariable": true});
 
     expect(filterClasses(attributes)).toEqual([ 
         { fullClass: 'height-2rem', classKey: 'height', classValue: '2rem' }, 

src/tests/playground.ts

@@ -23,7 +23,7 @@ import { filterClasses } from "../helpers";
 
 
 // /* with config:
-// * acceptAnyVariable: false
+// * acceptAnyVariable: true
 // */
 
 // console.log(filterClasses(["h-100"])) // {height: 100px}
@@ -41,7 +41,7 @@ import { filterClasses } from "../helpers";
 // console.log(filterClasses(["h-100%"])) //
 
 // /* with config:
-// * acceptAnyVariable: true
+// * acceptAnyVariable: false
 // */
 
 // console.log(filterClasses(["h-100"])) // {height: 100px}