tag, extract just the inner content - html = strings.TrimSpace(html) - - if strings.HasPrefix(html, "
") && strings.HasSuffix(html, "
") { - // Check if this is a single paragraph (no othertags inside) - inner := html[3 : len(html)-4] // Remove
and
- if !strings.Contains(inner, "") { - // Single paragraph - return just the inner content for inline injection - return inner, nil - } - } - - // Multiple paragraphs or other block content - return as-is - return html, nil -} diff --git a/internal/content/mock.go b/internal/content/mock.go index 9d33d70..2d45360 100644 --- a/internal/content/mock.go +++ b/internal/content/mock.go @@ -2,17 +2,19 @@ package content import ( "time" + + "github.com/insertr/insertr/internal/engine" ) // MockClient implements ContentClient with mock data for development type MockClient struct { - data map[string]ContentItem + data map[string]engine.ContentItem } // NewMockClient creates a new mock content client with sample data func NewMockClient() *MockClient { // Generate realistic mock content based on actual generated IDs - data := map[string]ContentItem{ + data := map[string]engine.ContentItem{ // Navigation (index.html has collision suffix) "navbar-logo-2b10ad": { ID: "navbar-logo-2b10ad", @@ -98,7 +100,7 @@ func NewMockClient() *MockClient { } // GetContent fetches a single content item by ID -func (m *MockClient) GetContent(siteID, contentID string) (*ContentItem, error) { +func (m *MockClient) GetContent(siteID, contentID string) (*engine.ContentItem, error) { if item, exists := m.data[contentID]; exists && item.SiteID == siteID { return &item, nil } @@ -108,8 +110,8 @@ func (m *MockClient) GetContent(siteID, contentID string) (*ContentItem, error) } // GetBulkContent fetches multiple content items by IDs -func (m *MockClient) GetBulkContent(siteID string, contentIDs []string) (map[string]ContentItem, error) { - result := make(map[string]ContentItem) +func (m *MockClient) GetBulkContent(siteID string, contentIDs []string) (map[string]engine.ContentItem, error) { + result := make(map[string]engine.ContentItem) for _, id := range contentIDs { item, err := m.GetContent(siteID, id) @@ -125,8 +127,8 @@ func (m *MockClient) GetBulkContent(siteID string, contentIDs []string) (map[str } // GetAllContent fetches all content for a site -func (m *MockClient) GetAllContent(siteID string) (map[string]ContentItem, error) { - result := make(map[string]ContentItem) +func (m *MockClient) GetAllContent(siteID string) (map[string]engine.ContentItem, error) { + result := make(map[string]engine.ContentItem) for _, item := range m.data { if item.SiteID == siteID { diff --git a/internal/content/site_manager.go b/internal/content/site_manager.go index 4ca9dc4..0d16714 100644 --- a/internal/content/site_manager.go +++ b/internal/content/site_manager.go @@ -7,6 +7,8 @@ import ( "path/filepath" "sync" "time" + + "github.com/insertr/insertr/internal/engine" ) // SiteConfig represents configuration for a registered site @@ -28,7 +30,7 @@ type SiteManager struct { } // NewSiteManager creates a new site manager -func NewSiteManager(contentClient ContentClient, backupDir string, devMode bool) *SiteManager { +func NewSiteManager(contentClient engine.ContentClient, backupDir string, devMode bool) *SiteManager { if backupDir == "" { backupDir = "./insertr-backups" } diff --git a/internal/content/types.go b/internal/content/types.go deleted file mode 100644 index b28270f..0000000 --- a/internal/content/types.go +++ /dev/null @@ -1,28 +0,0 @@ -package content - -// ContentItem represents a piece of content from the database -type ContentItem struct { - ID string `json:"id"` - SiteID string `json:"site_id"` - Value string `json:"value"` - Type string `json:"type"` - UpdatedAt string `json:"updated_at"` -} - -// ContentResponse represents the API response structure -type ContentResponse struct { - Content []ContentItem `json:"content"` - Error string `json:"error,omitempty"` -} - -// ContentClient interface for content retrieval -type ContentClient interface { - // GetContent fetches content by ID - GetContent(siteID, contentID string) (*ContentItem, error) - - // GetBulkContent fetches multiple content items by IDs - GetBulkContent(siteID string, contentIDs []string) (map[string]ContentItem, error) - - // GetAllContent fetches all content for a site - GetAllContent(siteID string) (map[string]ContentItem, error) -} diff --git a/internal/engine/database_client.go b/internal/engine/database_client.go index 4e99257..632d8ef 100644 --- a/internal/engine/database_client.go +++ b/internal/engine/database_client.go @@ -110,3 +110,47 @@ func (c *DatabaseClient) GetBulkContent(siteID string, contentIDs []string) (map return nil, fmt.Errorf("unsupported database type: %s", c.database.GetDBType()) } } + +// GetAllContent retrieves all content items for a site +func (c *DatabaseClient) GetAllContent(siteID string) (map[string]ContentItem, error) { + switch c.database.GetDBType() { + case "sqlite3": + contents, err := c.database.GetSQLiteQueries().GetAllContent(context.Background(), siteID) + if err != nil { + return nil, err + } + + items := make(map[string]ContentItem) + for _, content := range contents { + items[content.ID] = ContentItem{ + ID: content.ID, + SiteID: content.SiteID, + Value: content.Value, + Type: content.Type, + LastEditedBy: content.LastEditedBy, + } + } + return items, nil + + case "postgresql": + contents, err := c.database.GetPostgreSQLQueries().GetAllContent(context.Background(), siteID) + if err != nil { + return nil, err + } + + items := make(map[string]ContentItem) + for _, content := range contents { + items[content.ID] = ContentItem{ + ID: content.ID, + SiteID: content.SiteID, + Value: content.Value, + Type: content.Type, + LastEditedBy: content.LastEditedBy, + } + } + return items, nil + + default: + return nil, fmt.Errorf("unsupported database type: %s", c.database.GetDBType()) + } +} diff --git a/internal/engine/engine.go b/internal/engine/engine.go index 26787f8..4a79ed2 100644 --- a/internal/engine/engine.go +++ b/internal/engine/engine.go @@ -37,20 +37,33 @@ func (e *ContentEngine) ProcessContent(input ContentInput) (*ContentResult, erro processedElements := make([]ProcessedElement, len(elements)) for i, elem := range elements { - // Generate ID using the same algorithm as the parser - id := e.idGenerator.Generate(elem.Node, input.FilePath) + // Check if element already has a data-content-id + existingID := e.getAttribute(elem.Node, "data-content-id") + var id string + var wasGenerated bool + + if existingID != "" { + // Use existing ID from enhanced element + id = existingID + wasGenerated = false + } else { + // Generate new ID for unprocessed element + id = e.idGenerator.Generate(elem.Node, input.FilePath) + wasGenerated = true + } + generatedIDs[fmt.Sprintf("element_%d", i)] = id processedElements[i] = ProcessedElement{ Node: elem.Node, ID: id, Type: elem.Type, - Generated: true, + Generated: wasGenerated, Tag: elem.Node.Data, Classes: GetClasses(elem.Node), } - // Add content attributes to the node + // Add/update content attributes to the node e.addContentAttributes(elem.Node, id, elem.Type) } @@ -133,6 +146,16 @@ func (e *ContentEngine) addContentAttributes(node *html.Node, contentID, content e.setAttribute(node, "data-content-type", contentType) } +// getAttribute gets an attribute value from an HTML node +func (e *ContentEngine) getAttribute(node *html.Node, key string) string { + for _, attr := range node.Attr { + if attr.Key == key { + return attr.Val + } + } + return "" +} + // setAttribute sets an attribute on an HTML node func (e *ContentEngine) setAttribute(node *html.Node, key, value string) { // Remove existing attribute if it exists diff --git a/internal/engine/types.go b/internal/engine/types.go index 0518663..6530c4d 100644 --- a/internal/engine/types.go +++ b/internal/engine/types.go @@ -43,17 +43,25 @@ type ProcessedElement struct { } // ContentClient interface for accessing content data -// This will be implemented by database clients +// This will be implemented by database clients, HTTP clients, and mock clients type ContentClient interface { GetContent(siteID, contentID string) (*ContentItem, error) GetBulkContent(siteID string, contentIDs []string) (map[string]ContentItem, error) + GetAllContent(siteID string) (map[string]ContentItem, error) } // ContentItem represents a piece of content from the database type ContentItem struct { - ID string - SiteID string - Value string - Type string - LastEditedBy string + ID string `json:"id"` + SiteID string `json:"site_id"` + Value string `json:"value"` + Type string `json:"type"` + UpdatedAt string `json:"updated_at"` + LastEditedBy string `json:"last_edited_by,omitempty"` +} + +// ContentResponse represents the API response structure +type ContentResponse struct { + Content []ContentItem `json:"content"` + Error string `json:"error,omitempty"` } diff --git a/lib/src/core/api-client.js b/lib/src/core/api-client.js index b9e405c..8b08a1c 100644 --- a/lib/src/core/api-client.js +++ b/lib/src/core/api-client.js @@ -29,24 +29,15 @@ export class ApiClient { } - async createContent(contentId, content, type, htmlMarkup = null) { + async createContent(content, type, htmlMarkup) { try { const payload = { + html_markup: htmlMarkup, // Always send HTML markup - server extracts ID or generates new one value: content, type: type, file_path: this.getCurrentFilePath() // Always include file path for consistent ID generation }; - if (contentId) { - // Enhanced site - provide existing ID - payload.id = contentId; - } else if (htmlMarkup) { - // Non-enhanced site - provide HTML markup for unified engine ID generation - payload.html_markup = htmlMarkup; - } else { - throw new Error('Either contentId or htmlMarkup must be provided'); - } - const response = await fetch(`${this.baseUrl}?site_id=${this.siteId}`, { method: 'POST', headers: { @@ -61,7 +52,7 @@ export class ApiClient { console.log(`✅ Content created: ${result.id} (${result.type})`); return result; } else { - console.warn(`⚠️ Create failed (${response.status}): ${contentId || 'backend-generated'}`); + console.warn(`⚠️ Create failed (${response.status}): server will generate ID`); return null; } } catch (error) { @@ -69,7 +60,7 @@ export class ApiClient { console.warn(`🔌 API Server not reachable at ${this.baseUrl}`); console.warn('💡 Start full-stack development: just dev'); } else { - console.error('Failed to create content:', contentId, error); + console.error('Failed to create content:', error); } return false; } diff --git a/lib/src/core/editor.js b/lib/src/core/editor.js index 2ccc460..7161c73 100644 --- a/lib/src/core/editor.js +++ b/lib/src/core/editor.js @@ -102,13 +102,12 @@ export class InsertrEditor { contentValue = formData.text || formData; } - // Universal upsert - works for both new and existing content + // Universal upsert - server handles ID extraction/generation from markup const contentType = this.determineContentType(meta.element); const result = await this.apiClient.createContent( - meta.contentId, // Use existing ID if available, null if new contentValue, contentType, - meta.htmlMarkup + meta.htmlMarkup // Always send HTML markup - server is smart about ID handling ); if (result) { diff --git a/lib/src/core/insertr.js b/lib/src/core/insertr.js index f0a2d89..369adfa 100644 --- a/lib/src/core/insertr.js +++ b/lib/src/core/insertr.js @@ -106,6 +106,11 @@ export class InsertrCore { getElementMetadata(element) { const existingId = element.getAttribute('data-content-id'); + // Ensure element has insertr class for server processing + if (!element.classList.contains('insertr')) { + element.classList.add('insertr'); + } + // Send HTML markup to server for unified ID generation return { contentId: existingId, // null if new content, existing ID if updating diff --git a/test-sites/demo-site/insertr.js b/test-sites/demo-site/insertr.js index d118a0a..7599c8f 100644 --- a/test-sites/demo-site/insertr.js +++ b/test-sites/demo-site/insertr.js @@ -109,6 +109,11 @@ var Insertr = (function () { getElementMetadata(element) { const existingId = element.getAttribute('data-content-id'); + // Ensure element has insertr class for server processing + if (!element.classList.contains('insertr')) { + element.classList.add('insertr'); + } + // Send HTML markup to server for unified ID generation return { contentId: existingId, // null if new content, existing ID if updating @@ -2820,13 +2825,12 @@ Please report this to https://github.com/markedjs/marked.`,e){let r="
An error contentValue = formData.text || formData; } - // Universal upsert - works for both new and existing content + // Universal upsert - server handles ID extraction/generation from markup const contentType = this.determineContentType(meta.element); const result = await this.apiClient.createContent( - meta.contentId, // Use existing ID if available, null if new contentValue, contentType, - meta.htmlMarkup + meta.htmlMarkup // Always send HTML markup - server is smart about ID handling ); if (result) { @@ -3761,24 +3765,15 @@ Please report this to https://github.com/markedjs/marked.`,e){let r="
An error } - async createContent(contentId, content, type, htmlMarkup = null) { + async createContent(content, type, htmlMarkup) { try { const payload = { + html_markup: htmlMarkup, // Always send HTML markup - server extracts ID or generates new one value: content, type: type, file_path: this.getCurrentFilePath() // Always include file path for consistent ID generation }; - if (contentId) { - // Enhanced site - provide existing ID - payload.id = contentId; - } else if (htmlMarkup) { - // Non-enhanced site - provide HTML markup for unified engine ID generation - payload.html_markup = htmlMarkup; - } else { - throw new Error('Either contentId or htmlMarkup must be provided'); - } - const response = await fetch(`${this.baseUrl}?site_id=${this.siteId}`, { method: 'POST', headers: { @@ -3793,7 +3788,7 @@ Please report this to https://github.com/markedjs/marked.`,e){let r="
An error console.log(`✅ Content created: ${result.id} (${result.type})`); return result; } else { - console.warn(`⚠️ Create failed (${response.status}): ${contentId || 'backend-generated'}`); + console.warn(`⚠️ Create failed (${response.status}): server will generate ID`); return null; } } catch (error) { @@ -3801,7 +3796,7 @@ Please report this to https://github.com/markedjs/marked.`,e){let r="
An error console.warn(`🔌 API Server not reachable at ${this.baseUrl}`); console.warn('💡 Start full-stack development: just dev'); } else { - console.error('Failed to create content:', contentId, error); + console.error('Failed to create content:', error); } return false; }