odac 0.9.0 → 1.0.0

package/{framework/src → src}/View.js

@@ -20,7 +20,7 @@ class View {
       end: '*/ html += `'
     },
     '{{': {
-      function: '${Candy.Var(await ',
+      function: '${Odac.Var(await ',
       close: '}}',
       end: ').html().replace(/\\n/g, "<br>")}'
     },
@@ -30,7 +30,7 @@ class View {
     },
     component: {
       // TODO: Implement component
-      //   <candy:component name="navbar" title="Dashboard"/>
+      //   <odac:component name="navbar" title="Dashboard"/>
     },
     continue: {
       function: 'continue;',
@@ -50,7 +50,7 @@ class View {
     },
     fetch: {
       // TODO: Implement fetch
-      //  <candy:fetch fetch="/get/products" as="data" method="GET" headers="{}" body="null" refresh="false">
+      //  <odac:fetch fetch="/get/products" as="data" method="GET" headers="{}" body="null" refresh="false">
     },
     for: {
       function: '{ let _arr = $constructor; for(let $key in _arr){ let $value = _arr[$key];',
@@ -68,16 +68,16 @@ class View {
         condition: true
       }
     },
-    '<candy:js>': {
+    '<odac:js>': {
       end: ' html += `',
       function: '`; ',
-      close: '</candy:js>'
+      close: '</odac:js>'
     },
     lazy: {
       // TODO: Implement lazy
-      //  <candy:lazy>
-      //    <candy:component name="profile-card" data="user"/>
-      //  </candy:lazy>
+      //  <odac:lazy>
+      //    <odac:component name="profile-card" data="user"/>
+      //  </odac:lazy>
     },
     list: {
       arguments: {
@@ -98,21 +98,21 @@ class View {
     }
   }
   #part = {}
-  #candy = null
+  #odac = null
 
-  constructor(candy) {
-    this.#candy = candy
+  constructor(odac) {
+    this.#odac = odac
 
-    if (!global.Candy?.View?.EarlyHints) {
-      const config = candy.Config?.earlyHints
+    if (!global.Odac?.View?.EarlyHints) {
+      const config = odac.Config?.earlyHints
       this.#earlyHints = new EarlyHints(config)
       this.#earlyHints.init()
 
-      if (!global.Candy) global.Candy = {}
-      if (!global.Candy.View) global.Candy.View = {}
-      global.Candy.View.EarlyHints = this.#earlyHints
+      if (!global.Odac) global.Odac = {}
+      if (!global.Odac.View) global.Odac.View = {}
+      global.Odac.View.EarlyHints = this.#earlyHints
     } else {
-      this.#earlyHints = global.Candy.View.EarlyHints
+      this.#earlyHints = global.Odac.View.EarlyHints
     }
   }
 
@@ -123,24 +123,24 @@ class View {
 
   // - PRINT VIEW
   async print() {
-    if (this.#candy.Request.res.finished) return
+    if (this.#odac.Request.res.finished) return
 
-    const routePath = this.#candy.Request.req.url.split('?')[0]
+    const routePath = this.#odac.Request.req.url.split('?')[0]
 
     // Handle AJAX load requests
-    if (this.#candy.Request.isAjaxLoad === true && this.#candy.Request.ajaxLoad && this.#candy.Request.ajaxLoad.length > 0) {
+    if (this.#odac.Request.isAjaxLoad === true && this.#odac.Request.ajaxLoad && this.#odac.Request.ajaxLoad.length > 0) {
       let output = {}
       let variables = {}
 
       // Collect variables marked for AJAX
-      for (let key in this.#candy.Request.variables) {
-        if (this.#candy.Request.variables[key].ajax) {
-          variables[key] = this.#candy.Request.variables[key].value
+      for (let key in this.#odac.Request.variables) {
+        if (this.#odac.Request.variables[key].ajax) {
+          variables[key] = this.#odac.Request.variables[key].value
         }
       }
 
       // Render requested elements
-      for (let element of this.#candy.Request.ajaxLoad) {
+      for (let element of this.#odac.Request.ajaxLoad) {
         if (this.#part[element]) {
           let viewPath = this.#part[element]
           if (viewPath.includes('.')) viewPath = viewPath.replace(/\./g, '/')
@@ -151,14 +151,14 @@ class View {
       }
 
       const currentSkeleton = this.#part.skeleton || 'main'
-      const clientSkeleton = this.#candy.Request.clientSkeleton
+      const clientSkeleton = this.#odac.Request.clientSkeleton
       const skeletonChanged = clientSkeleton && clientSkeleton !== currentSkeleton
 
-      this.#candy.Request.header('Content-Type', 'application/json')
-      this.#candy.Request.header('X-Candy-Page', this.#candy.Request.page || '')
-      this.#candy.Request.header('Vary', 'X-Candy')
+      this.#odac.Request.header('Content-Type', 'application/json')
+      this.#odac.Request.header('X-Odac-Page', this.#odac.Request.page || '')
+      this.#odac.Request.header('Vary', 'X-Odac')
 
-      this.#candy.Request.end({
+      this.#odac.Request.end({
         output: output,
         variables: variables,
         skeletonChanged: skeletonChanged
@@ -171,7 +171,7 @@ class View {
     if (this.#part.skeleton && fs.existsSync(`./skeleton/${this.#part.skeleton}.html`)) {
       result = fs.readFileSync(`./skeleton/${this.#part.skeleton}.html`, 'utf8')
 
-      // Add data-candy-navigate to content wrapper for auto-navigation
+      // Add data-odac-navigate to content wrapper for auto-navigation
       result = this.#addNavigateAttribute(result)
 
       for (let key in this.#part) {
@@ -183,8 +183,8 @@ class View {
         }
       }
       if (this.#part.all) {
-        let parts = result.match(/{{.*?}}/g).map(part => part.replace(/{{|}}/g, '').trim())
-        if (parts)
+        let parts = (result.match(/{{.*?}}/g) || []).map(part => part.replace(/{{|}}/g, '').trim())
+        if (parts.length > 0)
           for (let part of parts) {
             part = part.trim()
             let file = this.#part.all.split('.')
@@ -198,7 +198,7 @@ class View {
     }
 
     if (result) {
-      const hasEarlyHints = this.#candy.Request.hasEarlyHints()
+      const hasEarlyHints = this.#odac.Request.hasEarlyHints()
 
       if (!hasEarlyHints) {
         const detectedResources = this.#earlyHints.extractFromHtml(result)
@@ -209,27 +209,27 @@ class View {
       }
     }
 
-    this.#candy.Request.header('Content-Type', 'text/html')
-    this.#candy.Request.end(result)
+    this.#odac.Request.header('Content-Type', 'text/html')
+    this.#odac.Request.end(result)
   }
 
-  #parseCandyTag(content) {
+  #parseOdacTag(content) {
     // Parse backend comments
-    // Multi-line: <!--candy ... candy-->
-    // Single-line: <!--candy ... -->
-    content = content.replace(/<!--candy([\s\S]*?)(?:candy-->|-->)/g, () => {
+    // Multi-line: <!--odac ... odac-->
+    // Single-line: <!--odac ... -->
+    content = content.replace(/<!--odac([\s\S]*?)(?:odac-->|-->)/g, () => {
       return ''
     })
 
-    // Parse <script:candy> tags (IDE-friendly JavaScript with backend execution)
-    content = content.replace(/<script:candy([^>]*)>([\s\S]*?)<\/script:candy>/g, (fullMatch, attributes, jsContent) => {
-      return `<candy:js>${jsContent}</candy:js>`
+    // Parse <script:odac> tags (IDE-friendly JavaScript with backend execution)
+    content = content.replace(/<script:odac([^>]*)>([\s\S]*?)<\/script:odac>/g, (fullMatch, attributes, jsContent) => {
+      return `<odac:js>${jsContent}</odac:js>`
     })
 
-    content = content.replace(/<candy:else\s*\/>/g, '<candy:else>')
-    content = content.replace(/<candy:elseif\s+([^>]*?)\/>/g, '<candy:elseif $1>')
+    content = content.replace(/<odac:else\s*\/>/g, '<odac:else>')
+    content = content.replace(/<odac:elseif\s+([^>]*?)\/>/g, '<odac:elseif $1>')
 
-    content = content.replace(/<candy([^>]*?)\/>/g, (fullMatch, attributes) => {
+    content = content.replace(/<odac([^>]*?)\/>/g, (fullMatch, attributes) => {
       attributes = attributes.trim()
 
       const attrs = {}
@@ -255,9 +255,9 @@ class View {
 
     let depth = 0
     let maxDepth = 10
-    while (depth < maxDepth && content.includes('<candy')) {
+    while (depth < maxDepth && content.includes('<odac')) {
       const before = content
-      content = content.replace(/<candy([^>]*)>((?:(?!<candy)[\s\S])*?)<\/candy>/g, (fullMatch, attributes, innerContent) => {
+      content = content.replace(/<odac([^>]*)>((?:(?!<odac)[\s\S])*?)<\/odac>/g, (fullMatch, attributes, innerContent) => {
         attributes = attributes.trim()
         innerContent = innerContent.trim()
 
@@ -288,7 +288,7 @@ class View {
             if (variable.startsWith("'") && variable.endsWith("'")) {
               placeholders.push(variable)
             } else {
-              placeholders.push(`Candy.Var(await ${variable}).html().replace(/\\n/g, "<br>")`)
+              placeholders.push(`Odac.Var(await ${variable}).html().replace(/\\n/g, "<br>")`)
             }
             return `%s${placeholderIndex++}`
           })
@@ -322,20 +322,20 @@ class View {
     let content = fs.readFileSync(file, 'utf8')
 
     if (this.#cache[file]?.mtime !== mtime) {
-      content = Form.parse(content, this.#candy)
+      content = Form.parse(content, this.#odac)
 
       const jsBlocks = []
-      content = content.replace(/<script:candy([^>]*)>([\s\S]*?)<\/script:candy>/g, (match, attrs, jsContent) => {
-        const placeholder = `___CANDY_JS_BLOCK_${jsBlocks.length}___`
+      content = content.replace(/<script:odac([^>]*)>([\s\S]*?)<\/script:odac>/g, (match, attrs, jsContent) => {
+        const placeholder = `___ODAC_JS_BLOCK_${jsBlocks.length}___`
         jsBlocks.push(jsContent)
-        return `<script:candy${attrs}>${placeholder}</script:candy>`
+        return `<script:odac${attrs}>${placeholder}</script:odac>`
       })
 
-      content = this.#parseCandyTag(content)
-      content = content.replace(/`/g, '\\`').replace(/\$\{/g, '\\${')
+      content = this.#parseOdacTag(content)
+      content = content.replace(/`/g, '\\\\`').replace(/\$\{/g, '\\\\${')
 
       jsBlocks.forEach((jsContent, index) => {
-        content = content.replace(`___CANDY_JS_BLOCK_${index}___`, jsContent)
+        content = content.replace(`___ODAC_JS_BLOCK_${index}___`, jsContent)
       })
 
       let result = 'html += `\n' + content + '\n`'
@@ -345,11 +345,11 @@ class View {
         let func = this.#functions[key]
         let matches = func.close
           ? result.match(new RegExp(`${key}[\\s\\S]*?${func.close}`, 'g'))
-          : result.match(new RegExp(`<candy:${key}(?:\\s+[^>]*?(?:"[^"]*"|'[^']*'|[^"'>])*)?>`, 'g'))
+          : result.match(new RegExp(`<odac:${key}(?:\\s+[^>]*?(?:"[^"]*"|'[^']*'|[^"'>])*)?>`, 'g'))
         if (!matches) continue
         for (let match of matches) {
           let matchForParsing = match
-          if (!func.close) matchForParsing = matchForParsing.replace(/^<candy:/, '').replace(/>$/, '')
+          if (!func.close) matchForParsing = matchForParsing.replace(/^<odac:/, '').replace(/>$/, '')
           const attrRegex = /(\w+)(?:=(["'])((?:(?!\2).)*)\2|=([^\s>]+))?/g
           let attrMatch
           const args = []
@@ -401,10 +401,7 @@ class View {
             result = result.replace(match, fun + match.substring(key.length, match.length - func.close.length) + func.end)
           } else {
             result = result.replace(match, (func.replace ? `<${[func.replace, att].join(' ')}>` : '') + '`; ' + fun + ' html += `')
-            result = result.replace(
-              `</candy:${key}>`,
-              '`; ' + (func.end ?? '}') + ' html += `' + (func.replace ? `</${func.replace}>` : '')
-            )
+            result = result.replace(`</odac:${key}>`, '`; ' + (func.end ?? '}') + ' html += `' + (func.replace ? `</${func.replace}>` : ''))
           }
         }
       }
@@ -412,21 +409,21 @@ class View {
       if (!fs.existsSync(CACHE_DIR)) fs.mkdirSync(CACHE_DIR, {recursive: true})
       fs.writeFileSync(
         `${CACHE_DIR}/${cache}`,
-        `module.exports = async (Candy, get, __) => {\nlet html = '';\n${result}\nreturn html.trim()\n}`
+        `module.exports = async (Odac, get, __) => {\nlet html = '';\n${result}\nreturn html.trim()\n}`
       )
       delete require.cache[require.resolve(`${__dir}/${CACHE_DIR}/${cache}`)]
-      if (!Candy.View) Candy.View = {}
-      if (!Candy.View.cache) Candy.View.cache = {}
-      Candy.View.cache[file] = {
+      if (!Odac.View) Odac.View = {}
+      if (!Odac.View.cache) Odac.View.cache = {}
+      Odac.View.cache[file] = {
         mtime: mtime,
         cache: cache
       }
     }
     try {
-      return await require(`${__dir}/${CACHE_DIR}/${Candy.View.cache[file].cache}`)(
-        this.#candy,
-        key => this.#candy.Request.get(key),
-        (...args) => this.#candy.Lang.get(...args)
+      return await require(`${__dir}/${CACHE_DIR}/${Odac.View.cache[file].cache}`)(
+        this.#odac,
+        key => this.#odac.Request.get(key),
+        (...args) => this.#odac.Lang.get(...args)
       )
     } catch (e) {
       let stackLine = e.stack.split('\n')[1].match(/:(\d+):\d+/)
@@ -441,8 +438,8 @@ class View {
     if (args.length === 1 && typeof args[0] === 'object') for (let key in args[0]) this.#part[key] = args[0][key]
     else if (args.length === 2) this.#part[args[0]] = args[1]
 
-    if (!this.#candy.Request.page) {
-      this.#candy.Request.page = this.#part.content || this.#part.all || ''
+    if (!this.#odac.Request.page) {
+      this.#odac.Request.page = this.#part.content || this.#part.all || ''
     }
 
     this.#sendEarlyHintsIfAvailable()
@@ -457,21 +454,21 @@ class View {
 
   #addNavigateAttribute(skeleton) {
     skeleton = skeleton.replace(/(<[^>]+>)(\s*\{\{\s*CONTENT\s*\}\})/, (match, openTag, content) => {
-      if (openTag.includes('data-candy-navigate')) return match
-      const tagWithAttr = openTag.slice(0, -1) + ' data-candy-navigate="content">'
+      if (openTag.includes('data-odac-navigate')) return match
+      const tagWithAttr = openTag.slice(0, -1) + ' data-odac-navigate="content">'
       return tagWithAttr + content
     })
 
     const skeletonName = this.#part.skeleton || 'main'
-    const pageName = this.#candy.Request.page || ''
+    const pageName = this.#odac.Request.page || ''
 
     skeleton = skeleton.replace(/<html([^>]*)>/, (match, attrs) => {
       const updates = []
-      if (!attrs.includes('data-candy-skeleton')) {
-        updates.push(`data-candy-skeleton="${skeletonName}"`)
+      if (!attrs.includes('data-odac-skeleton')) {
+        updates.push(`data-odac-skeleton="${skeletonName}"`)
       }
-      if (!attrs.includes('data-candy-page')) {
-        updates.push(`data-candy-page="${pageName}"`)
+      if (!attrs.includes('data-odac-page')) {
+        updates.push(`data-odac-page="${pageName}"`)
       }
       if (updates.length === 0) return match
       return `<html${attrs} ${updates.join(' ')}>`
@@ -481,9 +478,9 @@ class View {
   }
 
   #sendEarlyHintsIfAvailable() {
-    if (this.#candy.Request.res.headersSent) return
+    if (this.#odac.Request.res.headersSent) return
 
-    const routePath = this.#candy.Request.req.url.split('?')[0]
+    const routePath = this.#odac.Request.req.url.split('?')[0]
     const viewPaths = []
 
     if (this.#part.skeleton) {
@@ -505,7 +502,7 @@ class View {
     }
 
     if (hints && hints.length > 0) {
-      this.#candy.Request.setEarlyHints(hints)
+      this.#odac.Request.setEarlyHints(hints)
     }
   }
 }