@massimo-cassandro/minimo 1.33.0 → 1.33.1

package/src/web-components/json-table/src/update-info.js

@@ -1,48 +1,67 @@
 /*! minimo - json-table: info text update */
 
-/** @typedef {import('./defaults.js').JsonTableParams} JsonTableParams */
-/** @typedef {import('./main-builder.js').JsonTableElements} JsonTableElements */
+import { setContent } from './content-utils.js';
+
+/** @typedef {import('../json-table-component.js').JsonTable} JsonTable */
 
 /**
- * Updates the info text (`elements.resultInfo`) using `params.infoText(shown, total)`.
+ * Updates the info text (`elements.resultInfo`) from the current state.
+ *
+ * Content resolution:
+ * - `params.infoText` function → `infoText(start, end, totRec, filteredRec, page, totPages)`
+ * - no rows → `labels.noResults` (search active) or `labels.noRows`
+ * - otherwise the mustache-like template `params.infoText` (string) or `labels.info`, with the
+ *   placeholders `{start}`, `{end}`, `{totRec}`, `{filteredRec}`, `{page}`, `{totPages}` replaced
+ *   by the locale-formatted numbers
  *
- * The returned value can be a Node (appended as-is), a plain string (set as `textContent`)
- * or an HTML string (sanitized via `Element.setHTML` where supported, `innerHTML` otherwise,
- * consistently with domBuilder).
+ * `start`/`end` are the 1-based indexes of the first/last row of the current page within the
+ * filtered set (0 when there are no rows).
  *
- * @param {JsonTableElements} elements - Generated elements (see `main-builder.js`)
- * @param {JsonTableParams} params - Resolved params
- * @param {number} shown - Number of rows currently displayed
- * @param {number} total - Total number of rows in the data set
+ * @param {JsonTable} jt - The component instance
  * @returns {void}
  *
  * @example
- * updateInfo(elements, params, 25, 100);
- * // with the default `infoText` → "Visualizzate <strong>25</strong> righe su <strong>100</strong>"
+ * updateInfo(jt);
+ * // default `labels.info`, page 2 of 25 rows per page, 60 rows → "Stai visualizzando le righe da 26 a 50, su un totale di 60 record trovati"
  */
-export function updateInfo(elements, params, shown, total) {
+export function updateInfo(jt) {
 
+  const { params, elements, state } = jt;
   const target = elements.resultInfo;
+
   if (!target) {
     return;
   }
 
-  const content = params.infoText(shown, total);
+  const shown = state.pageRows.length;
+  const perPage = params.perPage > 0 ? params.perPage : shown;
+  const start = shown ? (state.page - 1) * perPage + 1 : 0;
 
-  if (content instanceof Node) {
-    target.replaceChildren(content);
-    return;
-  }
+  /** @type {Record<string, number>} */
+  const values = {
+    start,
+    end: shown ? start + shown - 1 : 0,
+    totRec: state.totRec,
+    filteredRec: state.filteredRec,
+    page: state.page,
+    totPages: state.totPages
+  };
 
-  const text = String(content ?? '');
+  let content;
 
-  if (!text.includes('<')) {
-    target.textContent = text;
+  if (typeof params.infoText === 'function') {
+    content = params.infoText(values.start, values.end, values.totRec, values.filteredRec, values.page, values.totPages);
 
-  } else if (typeof target.setHTML === 'function') {
-    target.setHTML(text);
+  } else if (values.filteredRec === 0) {
+    content = state.searchTerm ? params.labels.noResults : params.labels.noRows;
 
   } else {
-    target.innerHTML = text;
+    const tpl = params.infoText ?? params.labels.info ?? '';
+    content = String(tpl).replace(
+      /\{(start|end|totRec|filteredRec|page|totPages)\}/g,
+      (_, key) => values[key].toLocaleString(params.locale)
+    );
   }
+
+  setContent(target, content);
 }

package/src/web-components/s-datatable-component/{docs.md → readme.md}

@@ -1,6 +1,8 @@
-# `s-datatable` web-component per simple-datatables
+# `s-datatable` web-component per [simple-datatables](https://fiduswriter.github.io/simple-datatables/documentation/)
+
+
+>**NB: deprecato, utilizzare [json-table](../json-table/readme.md)** 
 
-<https://fiduswriter.github.io/simple-datatables/documentation/>
 
 ## Installazione
 
@@ -279,7 +281,7 @@ cols: [
                    //   'sf_datetime'   – data e ora da oggetto Symfony ({ date, timezone }),
                    //                     pre-elaborato in _load
                    //   'sf_date'       – come 'sf_datetime', ma mostra solo la data
-                   //   'datetime'      – data e ora da stringa/valore parsabile da `new Date()`
+                   //   'datetime'      – data e ora da stringa/valore elaborabile da `new Date()`
                    //   'date'          – come 'datetime', ma mostra solo la data
                    //                     (date/datetime: formato it-IT, allineamento a destra,
                    //                     data-order impostato per l'ordinamento; null → '—')

package/src/web-components/s-datatable-component/s-datatable-component.js

@@ -502,7 +502,7 @@ class SimpleDatatableAdapter extends HTMLElement {
    *                 Se presente e !== undefined sovrascrive sempre l'attributo.
    *                 Passare esplicitamente `null` per ignorare l'attributo e
    *                 ricevere il defaultValue.
-   *   2. Attributo HTML – se il valore inizia con [ o { viene auto-parsato
+   *   2. Attributo HTML – se il valore inizia con [ o { viene auto-elaborato
    *                 da JSON (utile per cols, che può stare nell'attributo).
    *   3. defaultValue – fallback finale.
    *

package/types/global.d.ts

@@ -3,9 +3,23 @@
 // The canonical definition lives in dom-builder.js — this only re-exports it.
 type DomBuilderItem = import('../src/utilities/dom-builder/dom-builder.js').DomBuilderItem;
 
-// Sanitizer API (Element.setHTML / getHTML) — not yet in TypeScript's lib.dom.d.ts.
+// Global alias for the `<json-table>` web component class, so consumer scripts can write
+// `/** @type {JsonTable} */` without importing the type. The tag name map augmentation makes
+// `document.querySelector('json-table')` / `document.createElement('json-table')` return a
+// `JsonTable` instance without casts. Consumers get both by adding this file to their
+// jsconfig/tsconfig `include` (e.g. "node_modules/@massimo-cassandro/minimo/types/global.d.ts").
+type JsonTable = import('../src/web-components/json-table/json-table-component.js').JsonTable;
+
+interface HTMLElementTagNameMap {
+  'json-table': JsonTable;
+}
+
+// Sanitizer API (Element.setHTML / getHTML). Declared as required members (not optional) so
+// the augmentation stays compatible with the lib.dom versions that already include them
+// (overload signatures must all be optional or all required); the runtime code still checks
+// `typeof el.setHTML === 'function'` before using it.
 // https://developer.mozilla.org/en-US/docs/Web/API/Element/setHTML
 interface Element {
-  setHTML?(input: string, options?: { sanitizer?: unknown }): void;
-  getHTML?(options?: { serializableShadowRoots?: boolean; shadowRoots?: ShadowRoot[] }): string;
+  setHTML(input: string, options?: { sanitizer?: unknown }): void;
+  getHTML(options?: { serializableShadowRoots?: boolean; shadowRoots?: ShadowRoot[] }): string;
 }

package/dev-tools/starter-kit/source_files/app_index.js

@@ -1 +0,0 @@
-import './index.css';

package/snippets/config-templates/_htaccess

@@ -1,69 +0,0 @@
-
-# no cache
-# <IfModule mod_headers.c>
-#   Header set Cache-Control "no-cache, no-store, must-revalidate"
-#   Header set Pragma "no-cache"
-#   Header set Expires 0
-# </IfModule>
-
-# blocco iframe
-# "deny" = tutti siti
-# "sameorigin" tutti tranne quelli che vengono dalla stessa origine
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
-Header set X-Frame-Options "sameorigin"
-
-
-<IfModule mod_expires.c>
-  ExpiresActive On
-  AddType application/vnd.ms-fontobject .eot
-  AddType application/x-font-ttf .ttf
-  AddType application/x-font-opentype .otf
-  AddType application/x-font-woff .woff
-  AddType application/x-font-woff2 .woff2
-  AddType application/font-sfnt otf ttf
-  AddType application/font-woff  woff
-  AddType application/font-woff2 woff2
-  AddType image/svg+xml .svg
-
-  ExpiresByType application/vnd.ms-fontobject "access plus 1 year"
-  ExpiresByType application/x-font-ttf "access plus 1 year"
-  ExpiresByType application/x-font-opentype "access plus 1 year"
-  ExpiresByType application/x-font-woff "access plus 1 year"
-  ExpiresByType application/x-font-woff2 "access plus 1 year"
-  ExpiresByType application/font-sfnt "access plus 1 year"
-  ExpiresByType application/font-woff "access plus 1 year"
-  ExpiresByType application/font-woff2 "access plus 1 year"
-
-  ExpiresByType text/html "access plus 1 hour"
-  ExpiresByType text/css "access plus 1 year"
-  ExpiresByType text/x-javascript "access plus 1 year"
-  ExpiresByType application/javascript "access plus 1 year"
-  ExpiresByType application/x-javascript "access plus 1 year"
-
-  ExpiresByType image/svg+xml "access plus 1 year"
-  ExpiresByType image/gif "access plus 1 year"
-  ExpiresByType image/png "access plus 1 year"
-  ExpiresByType image/jpeg "access plus 1 year"
-  ExpiresByType image/pjpeg "access plus 1 year"
-  ExpiresByType image/webp "access plus 1 year"
-  ExpiresByType image/avif "access plus 1 year"
-
-  ExpiresByType application/pdf "access plus 1 year"
-
-  ExpiresByType video/mp4 "access plus 1 year"
-  ExpiresByType video/webm "access plus 1 year"
-  ExpiresByType video/x-m4v "access plus 1 year"
-  ExpiresByType video/quicktime "access plus 1 year"
-  ExpiresByType audio/mpeg "access plus 1 year"
-  ExpiresByType audio/x-wav "access plus 1 year"
-
-  ExpiresByType image/x-icon "access plus 1 year"
-  ExpiresDefault "access plus 1 year"
-</IfModule>
-
-<IfModule !mod_expires.c>
-  <IfModule mod_headers.c>
-    # 1 year
-    Header set Cache-Control 'public, max-age 31536000'
-  </IfModule>
-</IfModule>

package/snippets/config-templates/robots.txt

@@ -1,5 +0,0 @@
-User-agent: *
-Allow: /
-# Disallow: /
-
-Sitemap: https://www.example.com/sitemap.xml

package/snippets/config-templates/rollup.config.mjs

@@ -1,115 +0,0 @@
-import terser  from '@rollup/plugin-terser';
-import fs from 'fs';
-import node_resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
-
-// https://github.com/hyhappy/rollup-plugin-string-html
-// import htmlString from 'rollup-plugin-string-html';
-
-// https://github.com/exuanbo/rollup-plugin-minify-html-template-literals
-// https://github.com/asyncLiz/minify-html-literals
-// https://github.com/kangax/html-minifier#options-quick-reference
-// import minifyHTML from 'rollup-plugin-minify-html-template-literals';
-
-import p from '../package.json'; // assert { type: 'json' };
-
-const terserOptions = {
-    compress: {
-      passes: 2
-    }
-  },
-  anno = new Date().getFullYear(),
-  dirs = [
-    {source_dir: './front-end/js', output_dir: './AppBundle/Resources/public/js'}
-  ];
-
-let config = [];
-
-// lettura subdir apps e aggiunta a `dirs`
-fs.readdirSync('./front-end/apps').forEach(item => {
-  let stats = fs.statSync(`./front-end/apps/${item}`); // stats.isFile() / stats.isDirectory()
-  if(stats.isDirectory()) {
-    dirs.push({
-      source_dir: `./front-end/apps/${item}`,
-      output_dir: `./AppBundle/Resources/public/apps/${item}`
-    });
-  }
-});
-
-dirs.forEach(dir => {
-
-  fs.readdirSync(dir.source_dir)
-    .filter(f => /\.js$/.test(f))
-    .filter(f => /^[^_]/.test(f)) // ignore files starting with _
-    .forEach(file => {
-
-      let format = 'iife',
-        name = null;
-
-      if(/(-umd\.js)$/.test(file)) {
-        format = 'umd';
-        name = file.replace('-umd.js', '').replace(/-/g, '_');
-      }
-
-      config.push(
-        {
-          // preserveEntrySignatures: false,
-          input: `${dir.source_dir}/${file}`,
-          plugins: [
-            // deve essere il primo
-            // minifyHTML({
-            //   options: {
-            //     minifyOptions: {
-            //       html5: true,
-            //       collapseWhitespace: true,
-            //       collapseInlineTagWhitespace: true,
-            //       conservativeCollapse: true,
-            //       decodeEntities: true
-            //     },
-            //     shouldMinify: () => true
-            //   },
-            // }),
-            node_resolve(),
-            commonjs(),
-            terser(terserOptions),
-          ],
-          output: [{
-            file: `${dir.output_dir}/${file.replace('.js', '-min.js')}`,
-            format: format,
-            sourcemap: true,
-            name: name,
-            banner: `/*! xxxx v.${p.version} - Massimo Cassandro ${anno} */`,
-            // footer: `//! Released on ${new Date().toLocaleString('it-IT', { year: 'numeric',  month: 'short', day: '2-digit', hour12: false, hour:'2-digit', minute:'2-digit' })}`
-          }]
-        }
-      );
-
-    });
-});
-
-export default config;
-
-
-// versione statica
-
-// export default [
-//   {
-//     input: 'input.js',
-//     plugins: [
-//       node_resolve(),
-//       // commonjs(),
-//       terser({ compress: { passes: 2 } }),
-//     ],
-//     output: [
-//       {
-//         file: 'output.min.js',
-//         format: 'iife',
-//         sourcemap: true,
-
-//         banner: `/*! xxxx v.${p.version} - Massimo Cassandro ${anno} */`,
-//         // footer: `//! Released on ${new Date().toLocaleString('it-IT', { year: 'numeric',  month: 'short', day: '2-digit', hour12: false, hour:'2-digit', minute:'2-digit' })}`
-//       }
-//     ]
-//   },
-//   ...
-// ];