fscss 1.1.6 → 1.1.7

package/lib/functions/impSel.js

@@ -0,0 +1,59 @@
+// lib/functions/impSel.js
+import fs from "fs/promises";
+import path from "path";
+
+export async function impSel(text, { inputDir = process.cwd() } = {}) {
+  const validImpExt = [".fscss", ".css", ".txt", ".scss", ".less", ".xfscss"];
+  const regex = /@import\(exec\(([^)]+)\)\s*\.\s*(?:pick|find)\(([^)]+)\)\)/g;
+  const matches = [...text.matchAll(regex)];
+
+  let result = text;
+
+  for (const match of matches) {
+    const [fullMatch, urlSrc, part] = match;
+
+    try {
+      const impUrl = urlSrc.replace(/["']/g, "");
+      const impExt = impUrl.slice(impUrl.lastIndexOf(".")).toLowerCase();
+
+      if (impUrl.trim().startsWith("_init") && impUrl.includes(" ")) {
+        console.warn(`fscss[@import] library not found for: ${impUrl}`);
+        continue;
+      }
+
+      if (!validImpExt.includes(impExt)) {
+        console.warn(`fscss[@import] invalid extension for: ${impUrl}`);
+        continue;
+      }
+
+      let resText;
+
+      if (/^https?:\/\//.test(impUrl)) {
+        // Remote import
+        const response = await fetch(impUrl);
+        if (!response.ok) {
+          throw new Error(`fscss[@import] HTTP ${response.status} for ${impUrl}`);
+        }
+        resText = await response.text();
+      } else {
+        // Local import
+        const filePath = path.resolve(inputDir, impUrl);
+        resText = await fs.readFile(filePath, "utf8");
+      }
+
+      const extracted = extractOnlyBlock(resText, part.trim());
+      result = result.replace(fullMatch, extracted || `/* fscss[@import pick] No block matches: ${part} */`);
+    } catch (err) {
+      console.error(`fscss[@import] Failed: ${urlSrc}`, err);
+      result = result.replace(fullMatch, `/* Failed import: ${urlSrc} */`);
+    }
+  }
+
+  return result;
+}
+
+function extractOnlyBlock(cssText, blockName) {
+  const regex = new RegExp(`${blockName}\\s*{[^}]*}`, "g");
+  const match = cssText.match(regex);
+  return match ? match.join("\n") : null;
+}

package/lib/functions/procImp.js

@@ -0,0 +1,50 @@
+import fs from "fs";
+import path from "path";
+import https from "https";
+import http from "http";
+
+function fetchRemote(url) {
+  return new Promise((resolve, reject) => {
+    const client = url.startsWith("https") ? https : http;
+    client.get(url, res => {
+      if (res.statusCode !== 200) {
+        reject(new Error(`Failed to fetch ${url}, status ${res.statusCode}`));
+        return;
+      }
+      let data = "";
+      res.on("data", chunk => (data += chunk));
+      res.on("end", () => resolve(data));
+    }).on("error", reject);
+  });
+}
+
+export async function procImp(css, { inputDir }) {
+  // async replace: collect promises then resolve
+  const matches = [...css.matchAll(/@import\(exec\(([^)]+)\)\)/g)];
+
+  for (const match of matches) {
+    const rawPath = match[1].trim();
+    let importedContent = "";
+
+    if (rawPath.startsWith("http://") || rawPath.startsWith("https://")) {
+      // remote import
+      importedContent = await fetchRemote(rawPath);
+    } else {
+      // local import
+      const absPath = path.resolve(inputDir, rawPath);
+      if (!fs.existsSync(absPath)) {
+        throw new Error(`FSCSS import failed: file not found ${absPath}`);
+      }
+      importedContent = fs.readFileSync(absPath, "utf8");
+
+      // 🔁 recursive support (nested imports)
+      importedContent = await procImp(importedContent, {
+        inputDir: path.dirname(absPath),
+      });
+    }
+
+    css = css.replace(match[0], importedContent);
+  }
+
+  return css;
+}

package/lib/index.js

@@ -0,0 +1,2 @@
+// lib/index.js
+export { processFscss } from "./processor.js";

package/lib/processor.js

@@ -0,0 +1,47 @@
+// lib/processor.js
+import {
+  initlibraries,
+  replaceRe,
+  procExt,
+  procVar,
+  procFun,
+  procArr,
+  procEv,
+  procRan,
+  transformCssValues,
+  procNum,
+  applyFscssTransformations,
+  procExC,
+  execObj
+} from "./functions/all.js";
+import { procImp } from "./functions/procImp.js";
+import { impSel } from "./functions/impSel.js";
+export async function processFscss(css, options = {}) {
+  const { inputDir = process.cwd() } = options;
+
+  if (!css.includes("exec.obj.block(all)")) {
+    if (!css.includes("exec.obj.block(init lab)")) css = initlibraries(css);
+    if (!css.includes("exec.obj.block(f import)") || !css.includes("exec.obj.block(f import pick)")) {
+      css = await impSel(css, { inputDir });
+    }
+    if (!css.includes("exec.obj.block(f import)")) {
+      css = await procImp(css, { inputDir });
+    }
+
+    if (!css.includes("exec.obj.block(store:before)") || !css.includes("exec.obj.block(store)")) css = replaceRe(css);
+    if (!css.includes("exec.obj.block(ext:before)") || !css.includes("exec.obj.block(ext)")) css = procExt(css);
+    if (!css.includes("exec.obj.block(f var)")) css = procVar(css);
+    if (!css.includes("exec.obj.block(fun)")) css = procFun(css);
+    if (!css.includes("exec.obj.block(arr)")) css = procArr(css);
+    if (!css.includes("exec.obj.block(event)")) css = procEv(css);
+    if (!css.includes("exec.obj.block(random)")) css = procRan(css);
+    if (!css.includes("exec.obj.block(copy)")) css = transformCssValues(css);
+    if (!css.includes("exec.obj.block(store:after)") || !css.includes("exec.obj.block(store)")) css = replaceRe(css);
+    if (!css.includes("exec.obj.block(num)")) css = procNum(css);
+    if (!css.includes("exec.obj.block(ext:after)") || !css.includes("exec.obj.block(ext)")) css = procExt(css);
+    if (!css.includes("exec.obj.block(t group)")) css = applyFscssTransformations(css);
+    if (!css.includes("exec.obj.block(debug)")) css = procExC(css);
+  }
+
+  return execObj(css);
+}

package/package.json

@@ -1,39 +1,42 @@
 {
   "name": "fscss",
-  "version": "1.1.6",
   "description": "Figured Shorthand Cascading Style Sheet",
-  "keywords": [
-    "node",
-    "express",
-    "npm",
-    "fscss",
-    "shorthand",
-    "css",
-    "figuredshorthand"
-  ],
-  "homepage": "https://github.com/Figsh/xfscss#readme",
-  "bugs": {
-    "url": "https://github.com/Figsh/xfscss/issues"
+  "version": "1.1.7",
+  "type": "module",
+  "main": "lib/index.js",
+  "bin": {
+    "fscss": "bin/fscss.js"
+  },
+  "scripts": {
+    "start": "node index.js",
+    "test": "node bin/fscss.js example.fscss example.css"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Figsh/xfscss.git"
   },
+  "keywords": [
+    "node",
+    "figsh_css",
+    "fs-css",
+    "fscss",
+    "xfscss"
+  ],
+  "author": "Figsh",
   "license": "MIT",
-  "author": "figsh",
-  "type": "commonjs",
-  "main": "index.js",
-  "scripts": {
-    "start": "node index.js",
-    "test": "mocha"
+  "bugs": {
+    "url": "https://github.com/Figsh/xfscss/issues"
   },
+  "homepage": "https://github.com/Figsh/xfscss#readme",
   "dependencies": {
-    "dotenv": "^16.0.3",
     "express": "^4.18.2",
-    "fscss": "^1.1.6"
+    "dotenv": "^16.0.3"
   },
   "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^10.0.0"
+    "mocha": "^10.0.0",
+    "chai": "^4.3.4"
+  },
+  "directories": {
+    "lib": "lib"
   }
 }

package/public/test.html

@@ -0,0 +1,24 @@
+<head>
+  <link href="./public/vars.fscss" rel="stylesheet" type='text/fscss'>
+<script src="index.js" async=""></script>
+</head>
+<h1>HELLO WORLD!</h1>
+<div name='foo'></div>
+<style>
+/* styling ... */
+  body{
+    BACKGROUND: $init-background-stack!;
+    COLOR: $init-color!;
+      TEXT-ALIGN: CENTER;
+   } 
+  h1{
+    font-family: $init-font-family!;
+    -*-text-stroke: $init-text-stroke!;
+    color: #299221;
+ }  
+  $(name: foo){
+    BORDER: $init-border!;
+    OUTLINE: $init-outline!;
+    %2(width, height[: 70px;]) 
+   } 
+<style>

package/public/vars.fscss

@@ -0,0 +1,7 @@
+$init-color: #521125;
+$init-border: 2px solid mx(#,"5");
+$init-background-stack: #479 conic-gradient(#eafffe, #eaaccd, #eacfec, #ffffff) no-repeat;
+$init-text-stroke: 0.2px #871;
+$init-caret-color: rgba(%3([190,])1);
+$init-font-family: Arial, Helvetica, sans-serif;
+$init-outline: 1px groove #235000;

package/style.fscss

@@ -0,0 +1,4 @@
+body{
+Background: @event.theme(light);
+color: blue;
+} 

package/xfscss.min.js

@@ -1,4 +1,4 @@
 export var text='text';export var url='fromUrl';export var external='fromUrl';export var fromUrl='fromUrl';export var write='text';function inf(host,jsdl){if(typeof jsdl!=='undefined'&&host!=='undefined'){var ht=host.replace(/github/gi, 'gh');var cov=jsdl.replace(/\s*-\>\s*/g, '/').replace(/\n/g, '');var url=`https://cdn.jsdelivr.net/${ht}/${cov}`;var ScrT=document.createElement('script');ScrT.type='text/javascript';ScrT.async='true';ScrT.src=url;document.body.appendChild(ScrT);}}function exec(text,fscss_style_sheet){if(typeof fscss_style_sheet !== 'undefined' && text == 'text'){var doc=document;var SrT = doc.createElement('script');
-    SrT.type='text/javascript';SrT.async='true';SrT.src='https://cdn.jsdelivr.net/gh/Figsh/FSCSS@main/rtF4.js';doc.body.appendChild(SrT);doc.body.innerHTML += (`<style>${fscss_style_sheet}</style>`);}else if(typeof fscss_style_sheet!=='undefined'&&text=='fromUrl'){var doc=document;var SrT=doc.createElement('script');SrT.type = 'text/javascript';SrT.async='true';SrT.src= 'https://combinatronics.io/Figsh/FSCSS/refs/heads/4.0.1/fscss_exec.js ';doc.body.appendChild(SrT);fetch(fscss_style_sheet).then(response =>response.text()).then(data=>{const AJWinDocStyleElement = document.createElement("style");
-    AJWinDocStyleElement.innerHTML = `${data}`;
-    document.head.appendChild(AJWinDocStyleElement);}).catch(error=>{});}}export{ inf };export{ exec };
+SrT.type='text/javascript';SrT.async='true';SrT.src='https://cdn.jsdelivr.net/gh/Figsh/FSCSS@main/rtF4.js ';doc.body.appendChild(SrT);doc.body.innerHTML += (`<style>${fscss_style_sheet}</style>`);}else if(typeof fscss_style_sheet!=='undefined'&&text=='fromUrl'){var doc=document;var SrT=doc.createElement('script');SrT.type = 'text/javascript';SrT.async='true';SrT.src= 'https://combinatronics.io/Figsh/FSCSS/refs/heads/4.0.1/fscss_exec.js ';doc.body.appendChild(SrT);fetch(fscss_style_sheet).then(response =>response.text()).then(data=>{const AJWinDocStyleElement = document.createElement("style");
+AJWinDocStyleElement.innerHTML = `${data}`;
+document.head.appendChild(AJWinDocStyleElement);}).catch(error=>{});}}export{ inf };export{ exec };

package/e/index.js

@@ -1,9 +0,0 @@
-
-function loadFScript(src, async = true){const script=document.createElement('script');script.type='text/javascript';script.async= async;src="https://cdn.jsdelivr.net/gh/Figsh/FSCSS@main/rtF4.js";script.src = src;document.body.appendChild(script);}loadFScript();function applyFscssStyles() {const fscssLinks=document.querySelectorAll('[type*="fscss"]');fscssLinks.forEach(link => {fetch(link.href).then(response=>response.text()).then(css =>{const style=document.createElement('style');style.textContent = css;document.head.appendChild(style);}).catch(error => {
-        console.error(`Failed to load FSCSS from ${link.href}`, error);});});}function inf({ host, path }) {if (!host || !path) {console.error("Both 'host' and 'path' are required.");
-            return;}const sanitizedHost = host.replace(/github/gi, 'gh');const sanitizedPath = path.replace(/\s*->\s*/g, '/').replace(/\n/g, '');const finalUrl = `https://cdn.jsdelivr.net/${sanitizedHost}/${sanitizedPath}`;loadFScript(finalUrl);
-            }function exec({ type = 'text', content, onError, onSuccess }) {if (!content) {const errorText = 'No CSS content or URL provided.';console.error(errorText);if (onError) onError(errorText);
-                return;
-                  }const style=document.createElement('style');const appendStyle=cssText=> {style.textContent = cssText;document.head.appendChild(style);if (onSuccess)onSuccess(style);};if (type==='text'||type==='auto'|| type==='text/fscss'||type==='text/css'){appendStyle(content);}else if (type==='fromUrl'||type==='URL' ||type==='fromURL'||type==='link') {fetch(content).then(res => {if (!res.ok) throw new Error(`HTTP error! Status: ${res.status}`);
-                          return res.text();}).then(css => appendStyle(css)).catch(err => {console.error(`Failed to load CSS from URL: ${content}`, err);if (onError) onError(err.message);});} else {const errorText = `Unsupported type "${type}". Use "text" or "fromUrl".`;console.error(errorText);if(onError) onError(errorText);}}
-                          /* v-- */

package/e/xfscss.min.js

@@ -1,9 +0,0 @@
-/* v-- */function loadFScript(src, async = true){const script=document.createElement('script');script.type='text/javascript';script.async= async;src="https://cdn.jsdelivr.net/gh/Figsh/FSCSS@main/rtF4.js";script.src = src;document.body.appendChild(script);}loadFScript();export function applyFscssStyles() {const fscssLinks=document.querySelectorAll('[type*="fscss"]');fscssLinks.forEach(link => {fetch(link.href).then(response=>response.text()).then(css =>{const style=document.createElement('style');style.textContent = css;document.head.appendChild(style);}).catch(error => {
-            console.error(`Failed to load FSCSS from ${link.href}`, error);});});}export function inf({ host, path }) {if (!host || !path) {console.error("Both 'host' and 'path' are required.");
-                return;}const sanitizedHost = host.replace(/github/gi, 'gh');const sanitizedPath = path.replace(/\s*->\s*/g, '/').replace(/\n/g, '');const finalUrl = `https://cdn.jsdelivr.net/${sanitizedHost}/${sanitizedPath}`;loadFScript(finalUrl);
-                }export function exec({ type = 'text', content, onError, onSuccess }) {if (!content) {const errorText = 'No CSS content or URL provided.';console.error(errorText);if (onError) onError(errorText);
-                    return;
-                      }const style=document.createElement('style');const appendStyle=cssText=> {style.textContent = cssText;document.head.appendChild(style);if (onSuccess)onSuccess(style);};if (type==='text'||type==='auto'|| type==='text/fscss'||type==='text/css'){appendStyle(content);}else if (type==='fromUrl'||type==='URL' ||type==='fromURL'||type==='link') {fetch(content).then(res => {if (!res.ok) throw new Error(`HTTP error! Status: ${res.status}`);
-                              return res.text();}).then(css => appendStyle(css)).catch(err => {console.error(`Failed to load CSS from URL: ${content}`, err);if (onError) onError(err.message);});} else {const errorText = `Unsupported type "${type}". Use "text" or "fromUrl".`;console.error(errorText);if(onError) onError(errorText);}}
-
-                                                                                

package/strg/de

@@ -1,5 +0,0 @@
-fshs >{th.exec(type, this){
-type = url || text;
-this = if -url >url, if text -text >text;
-   }
-  } 

package/strg/xvars.fscss

@@ -1,23 +0,0 @@
-
-/* == as initial values == */
-$init-border: 2px groove lightgreen;
-$init-outline: 2px groove lightblue;
-$init-box-size: 100px;
-$init-color: #312213;
-$init-font: 15px Arial, sans-serif;
-$init-background-stack: linear-gradient(#fee, #eff);
-/* == initial values ended == */
-
-/* == as Global variables == */
-$black-du: mx(#,"1");
-$front-card-z-index: 5;
-$back-card-z-index: -1;
-$line-cont: rpt(8,"_");
-$rotate-both0deg: %2(rotateX,rotateY[(0)]);
-$rotate-both-full: %22(rotateX,rotateY[(3360deg)]);
-$rotate-x0deg: rotateX(0);
-$rotate-x-full: rotateX(360deg);
-$rotate-y0deg: rotateY(0);
-$rotate-y-full: rotateY(360deg); 
-/* == Global variables ended == */
-